Name change ScalingController to ScalingPolicy#586
Merged
sharpener6 merged 2 commits intofinos:mainfrom Mar 10, 2026
Merged
Conversation
sharpener6
reviewed
Mar 5, 2026
src/scaler/scheduler/controllers/policies/simple_policy_controller.py
Outdated
Show resolved
Hide resolved
sharpener6
reviewed
Mar 6, 2026
sharpener6
reviewed
Mar 8, 2026
sharpener6
reviewed
Mar 8, 2026
700abc1 to
66f6bf7
Compare
gxuu
commented
Mar 9, 2026
9e8f6dc to
2582810
Compare
sharpener6
reviewed
Mar 10, 2026
src/scaler/scheduler/controllers/policies/simple_policy/scaling/mixins.py
Show resolved
Hide resolved
sharpener6
reviewed
Mar 10, 2026
sharpener6
reviewed
Mar 10, 2026
sharpener6
reviewed
Mar 10, 2026
sharpener6
reviewed
Mar 10, 2026
sharpener6
reviewed
Mar 10, 2026
b2b33cc to
7ee18d2
Compare
sharpener6
reviewed
Mar 10, 2026
31520bf to
2f008a9
Compare
Signed-off-by: gxu <georgexu420@163.com>
sharpener6
approved these changes
Mar 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
READY FOR REVIEW.
This PR make naming changes. This PR is the predecessor of #579.
CapabilityScalingPolicy, etc.)
Branch: mar-rename-scaling
1. WorkerAdapterController -> WorkerManagerController
worker_adapter_controller.py->worker_manager_controller.pyWorkerAdapterController->WorkerManagerController_worker_adapter_controller->_worker_manager_controller_adapter_alive_since->_manager_alive_since,_adapter_worker_groups->_manager_worker_groupsDEFAULT_WORKER_ADAPTER_TIMEOUT_SECONDS->DEFAULT_WORKER_MANAGER_TIMEOUT_SECONDSinformation_controller.pyandscheduler.pyto use new names2. WorkerAdapter protocol types -> WorkerManager protocol types
Renamed all protocol message classes, Cap'n Proto structs, and related variables:
WorkerAdapterHeartbeat->WorkerManagerHeartbeatWorkerAdapterHeartbeatEcho->WorkerManagerHeartbeatEchoWorkerAdapterCommandType->WorkerManagerCommandTypeWorkerAdapterCommand->WorkerManagerCommandWorkerAdapterCommandResponse->WorkerManagerCommandResponseworkerAdapterHeartbeat->workerManagerHeartbeat, etc.Updated across:
message.capnp,message.py,scheduler.py,worker_manager_controller.py, worker manager adapters (native.py,worker_manager.py,ecs.py),test_scaling.py3. ScalerPolicy interface + PolicyController + SimplePolicy refactor
New
PolicyControllerabstract class incontrollers/mixins.pyScalerPolicy(plus docstrings) into a newPolicyControllerABCadd_worker,remove_worker,get_worker_ids,get_worker_by_task_id,balance,assign_task,remove_task,has_available_worker,statistics,get_scaling_commands,get_scaling_statusScalerPolicy(inpolicies/mixins.py) retains the same methods without docstrings — serves as the internal policy interfaceNew
VanillaPolicyControllerincontrollers/vanilla_policy_controller.pyPolicyController, delegates all calls to an internalScalerPolicyinstance(policy_engine_type, policy_content)and creates the policy viacreate_policy()New
create_policy()factory inpolicies/library/utility.pycreate_scaler_policy()inpolicies/utility.pypolicies/utility.pydeleted (it also didpolicy_contentparsing; that's now inSimplePolicy)SimplePolicychangespolicy_content: strinstead of pre-parsedDict[str, str]policy_contentinternally (splits on;and=)_allocation_policy: TaskAllocatePolicyand_scaling_policy: ScalingPolicyScheduler wiring
scheduler.py:_scaler_policy: ScalerPolicy->_policy_controller: PolicyController = VanillaPolicyController(...)VanillaWorkerController:scaler_policyparam ->policy_controller,_scaler_policy->_policy_controllerVanillaBalanceController:scaler_policyparam ->policy_controller,_scaler_policy->_policy_controller4. ScalingController -> ScalingPolicy (internal scaling policies)
Renamed all scaling controller classes and related types:
ScalingController(mixin) ->ScalingPolicyNoScalingController->NoScalingPolicyVanillaScalingController->VanillaScalingPolicyCapabilityScalingController->CapabilityScalingPolicyFixedElasticScalingController->FixedElasticScalingPolicyScalingControllerStrategyenum ->ScalingPolicyStrategycreate_scaling_controller()->create_scaling_policy()SimplePolicy._scaling_controller->SimplePolicy._scaling_policyadapter_heartbeat->worker_manager_heartbeatin all scaling policy interfaces and implementations_create_adapter_heartbeat->_create_worker_manager_heartbeat5. WorkerAdapterConfig -> WorkerManagerConfig
src/scaler/config/common/worker_adapter.py->worker_manager.pyWorkerAdapterConfig->WorkerManagerConfigConfig section class renames + file renames
native_worker_adapter.py->native_worker_manager.py:NativeWorkerAdapterConfig->NativeWorkerManagerConfigfixed_native_worker_adapter.py->fixed_native_worker_manager.py:FixedNativeWorkerAdapterConfig->FixedNativeWorkerManagerConfigecs_worker_adapter.py->ecs_worker_manager.py:ECSWorkerAdapterConfig->ECSWorkerManagerConfigsymphony_worker_adapter.py->symphony_worker_manager.py:SymphonyWorkerConfig->SymphonyWorkerManagerConfigaws_hpc_worker_adapter.py->aws_hpc_worker_manager.py:AWSBatchWorkerAdapterConfig->AWSBatchWorkerManagerConfigFixedNativeWorkerManagerConfig.__post_init__validation referenceField rename
worker_adapter_config->worker_manager_configField access sites:
worker_manager_adapter/baremetal/native.pyworker_manager_adapter/baremetal/fixed_native.pyworker_manager_adapter/symphony/worker_manager.py(renamed fromworker_adapter.py)worker_manager_adapter/aws_raw/ecs.pyentry_points/worker_manager_aws_hpc_batch.pycluster/cluster.py(self._worker_adapter_config->self._worker_manager_config)tests/scheduler/test_scaling.pyImplementation class renames
NativeWorkerAdapter->NativeWorkerManagerinworker_manager_adapter/baremetal/native.py"worker_adapter_native"->"worker_manager_native"FixedNativeWorkerAdapter->FixedNativeWorkerManagerinworker_manager_adapter/baremetal/fixed_native.pyECSWorkerAdapter->ECSWorkerManagerinworker_manager_adapter/aws_raw/ecs.py"worker_adapter_ecs"->"worker_manager_ecs"SymphonyWorkerAdapter->SymphonyWorkerManagerinworker_manager_adapter/symphony/worker_manager.py(file renamed fromworker_adapter.py)"worker_adapter_symphony"->"worker_manager_symphony"Updated all imports in entry points,
cluster/cluster.py, andtests/scheduler/test_scaling.py.Run script fixes
Fixed broken imports in
src/run_worker_manager_*.pyscripts:run_worker_manager_baremetal_native.py:worker_adapter_native->worker_manager_baremetal_nativerun_worker_manager_baremetal_fixed_native.py:worker_adapter_fixed_native->worker_manager_baremetal_fixed_nativerun_worker_manager_aws_raw_ecs.py:worker_adapter_ecs->worker_manager_aws_raw_ecsrun_worker_manager_symphony.py:worker_adapter_symphony->worker_manager_symphonyTest renames
tests/scheduler/test_scaling.py:_run_native_worker_adapter->_run_native_worker_manager, variableadapter->manager6. TOML section names in entry point
parse()calls"native_worker_adapter"->"native_worker_manager"(+ description: "Scaler Native Worker Manager")"fixed_native_worker_adapter"->"fixed_native_worker_manager"(+ description: "Scaler Fixed Native Worker Manager")"symphony_worker_adapter"->"symphony_worker_manager"(+ description: "Scaler Symphony Worker Manager")"ecs_worker_adapter"->"ecs_worker_manager"(+ description: "Scaler ECS Worker Manager")"aws_hpc_worker_adapter"->"aws_hpc_worker_manager"(+ description: "Scaler AWS HPC Worker Manager")Local variables in entry points also renamed (e.g.,
native_adapter_config->native_manager_config,native_worker_adapter->native_worker_manager).7. Docs directory rename + prose updates
docs/source/tutorials/worker_adapters/->worker_manager_adapter/index.rsttoctree referencesconfiguration.rstcross-reference pathindex.rst,native.rst,fixed_native.rst,common_parameters.rst,aws_hpc/index.rst,aws_hpc/setup.rstfeatures.rst: heading + proseconfiguration.rst: heading, CLI commands table, TOML section namesscaling.rst: all "Worker Adapter" -> "Worker Manager", "Scaling Controller" -> "Scaling Policy", CLI command names, protocol message names8. README.md updates
scaler_worker_adapter_*->scaler_worker_manager_*(with updated baremetal paths)[native_worker_adapter]->[native_worker_manager], etc.9. Final-sweep comment/docstring fixes
Remaining "worker adapter" references in comments, docstrings, and UI strings:
worker_manager_adapter/aws_hpc/__init__.py: "AWS HPC Worker Adapter" -> "AWS HPC Worker Manager"worker_manager_adapter/aws_hpc/heartbeat_manager.py: "worker adapter" -> "worker manager" in docstringcapability_scaling.py: "scaling controller" -> "scaling policy", "worker adapter" -> "worker manager" in class docstringtests/scheduler/test_scaling.py:TestFixedElasticScalingdocstring "worker adapters" -> "worker managers"tests/worker_manager_adapter/aws_hpc/aws_hpc_test_harness.py: "Worker Adapter Test Harness" -> "Worker Manager Test Harness" (docstring, argparse description, print banner)10. Minor formatting / import-order fixes
client_agent.py: import reorder (UVYMQExceptionbeforeYMQExceptionalphabetically)io/uv_ymq/__init__.py: collapsed multi-line import to single lineio/uv_ymq/_uv_ymq.pyi: removed blank lines in class bodiesio/uv_ymq/sockets.py: minor formattingui/common/task_graph.py: minor formatting (function call parentheses)worker/worker.py: added trailing comma in multi-line set literalworker_manager_adapter/symphony/worker_manager.py: added trailing comma in multi-line set literaltests/config/test_config_class.py: updatedWorkerAdapterConfig->WorkerManagerConfigin config teststests/io/uv_ymq/test_sockets.py: minor formattingFiles changed summary
policies/library/__init__.py,policies/library/utility.py,vanilla_policy_controller.pypolicies/utility.py,worker_adapter_controller.pyworker_adapter_controller.py->worker_manager_controller.pyconfig/common/worker_adapter.py->worker_manager.pyconfig/section/native_worker_adapter.py->native_worker_manager.pyconfig/section/fixed_native_worker_adapter.py->fixed_native_worker_manager.pyconfig/section/ecs_worker_adapter.py->ecs_worker_manager.pyconfig/section/symphony_worker_adapter.py->symphony_worker_manager.pyconfig/section/aws_hpc_worker_adapter.py->aws_hpc_worker_manager.pyworker_manager_adapter/symphony/worker_adapter.py->worker_manager.pydocs/source/tutorials/worker_adapters/->worker_manager_adapter/git diff master...HEAD --stat)