Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(redis): 整机替换云区域 #8971 #8974

Merged
merged 1 commit into from
Jan 8, 2025
Merged

fix(redis): 整机替换云区域 #8971 #8974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_cluster_add_slave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ def add_slave_flow(self):
sub_pipeline = SubBuilder(root_id=self.root_id, data=self.data)
cluster_kwargs = deepcopy(act_kwargs)
cluster_info = RedisClusterAddSlaveFlow.get_cluster_info(bk_biz_id, cluster_id)
cluster_kwargs.bk_cloud_id = cluster_info["bk_cloud_id"] # 海外多云区域
cluster_kwargs.cluster.update(cluster_info)
cluster_kwargs.cluster["db_version"] = cluster_info["major_version"]
cluster_kwargs.cluster["created_by"] = self.data["created_by"]
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_cluster_instance_shutdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def start_instance_shutdown(self):
for k, v in cluster_info.items():
cluster_kwargs.cluster[k] = v
cluster_kwargs.cluster["created_by"] = self.data["created_by"]
cluster_kwargs.bk_cloud_id = cluster_info["bk_cloud_id"] # 海外多云区域
flow_data["shutdown_instances"] = cluster_instances
redis_pipeline.add_act(
act_name=_("初始化配置-{}".format(cluster_info["immute_domain"])),
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_cluster_scene_auotfix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def start_redis_auotfix(self):
cluster_kwargs = deepcopy(act_kwargs)
cluster_info = self.get_cluster_info(self.data["bk_biz_id"], cluster_id)
flow_data = self.data
cluster_kwargs.bk_cloud_id = cluster_info["bk_cloud_id"] # 海外多云区域
cluster_kwargs.cluster.update(cluster_info)
cluster_kwargs.cluster["created_by"] = self.data["created_by"]
flow_data["fix_info"] = cluster_fix
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_cluster_scene_cmr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ def complete_machine_replace(self):
sync_type = SyncType.SYNC_SMS.value

flow_data = self.data
cluster_kwargs.bk_cloud_id = cluster_info["bk_cloud_id"] # 海外多云区域
cluster_kwargs.cluster.update(cluster_info)
cluster_kwargs.cluster["created_by"] = self.data["created_by"]
flow_data["sync_type"] = sync_type
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_cluster_scene_mss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def redis_ms_switch(self):
cluster_info = self.__get_cluster_info(self.data["bk_biz_id"], cluster_id)

flow_data = self.data
cluster_kwargs.bk_cloud_id = cluster_info["bk_cloud_id"] # 海外多云区域
cluster_kwargs.cluster.update(cluster_info)
cluster_kwargs.cluster["created_by"] = self.data["created_by"]
cluster_kwargs.cluster["switch_option"] = ms_switch["online_switch_type"]
Expand Down
Loading