Skip to content

Commit c6016be

Browse files
谢凯ob-robot
authored andcommitted
bugfix for scale_out odp error
1 parent 2a68fb0 commit c6016be

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

core.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,6 @@ def scale_out(self, name):
18441844
repositories, install_plugins = self.search_components_from_mirrors_and_install(deploy_config, components=components)
18451845
if not install_plugins:
18461846
return False
1847-
self.set_repositories(repositories)
18481847
self.search_param_plugin_and_apply(repositories, deploy_config)
18491848
self._call_stdio('stop_loading', 'succeed')
18501849

@@ -1882,7 +1881,7 @@ def scale_out(self, name):
18821881

18831882
setattr(self.options, 'force', True)
18841883
deploy_config.enable_mem_mode()
1885-
workflows = self.get_workflows('scale_out', no_found_act='ignore')
1884+
workflows = self.get_workflows('scale_out', repositories=repositories, no_found_act='ignore')
18861885
if not self.run_workflow(workflows, no_found_act='ignore'):
18871886
return False
18881887

workflows/obproxy/3.1.0/scale_out.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
def scale_out(plugin_context, workflow, *args, **kwargs):
2222
added_servers = plugin_context.cluster_config.added_servers
23-
workflow.add_with_component(const.STAGE_FIRST, {'target_servers': added_servers}, 'start_check_pre', 'status_check', 'password_check', 'status_check',
23+
workflow.add_with_kwargs(const.STAGE_FIRST, {'target_servers': added_servers}, 'start_check_pre', 'status_check', 'password_check', 'status_check',
2424
'work_dir_check', 'port_check')
2525

26-
workflow.add(const.STAGE_SECOND, {'target_servers': added_servers}, 'parameter_pre', 'start_pre', 'start')
26+
workflow.add_with_kwargs(const.STAGE_SECOND, {'target_servers': added_servers}, 'parameter_pre', 'start_pre', 'start')
2727
plugin_context.return_true()

workflows/obproxy/4.2.3/scale_out.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
def scale_out(plugin_context, workflow, *args, **kwargs):
2222
added_servers = plugin_context.cluster_config.added_servers
23-
workflow.add_with_component(const.STAGE_FIRST, {'target_servers': added_servers}, 'start_check_pre', 'status_check', 'password_check', 'proxy_id_check', 'status_check',
23+
workflow.add_with_kwargs(const.STAGE_FIRST, {'target_servers': added_servers}, 'start_check_pre', 'status_check', 'password_check', 'proxy_id_check', 'status_check',
2424
'work_dir_check', 'port_check')
2525

26-
workflow.add(const.STAGE_SECOND, {'target_servers': added_servers}, 'parameter_pre', 'start_pre', 'start')
26+
workflow.add_with_kwargs(const.STAGE_SECOND, {'target_servers': added_servers}, 'parameter_pre', 'start_pre', 'start')
2727
plugin_context.return_true()

0 commit comments

Comments
 (0)