fix(redis): 集群类型变更、分片变更支持redis_cluster集群 #6602

TencentBlueKing · Sep 2, 2024 · ba1a79a · ba1a79a
1 parent 0807e08
commit ba1a79a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dbm-ui/backend/db_services/redis/redis_modules/util.py b/dbm-ui/backend/db_services/redis/redis_modules/util.py
@@ -25,6 +25,8 @@ def get_redis_moudles_detail(major_version: str, module_names: list = []) -> lis
     """
     if not major_version:
         return []
+    if not module_names:
+        return []
     where = Q(major_version=major_version)
     if module_names:
         where = where & Q(module_name__in=module_names)

diff --git a/dbm-ui/backend/flow/plugins/components/collections/redis/redis_dts.py b/dbm-ui/backend/flow/plugins/components/collections/redis/redis_dts.py
@@ -40,7 +40,7 @@
 )
 from backend.db_services.redis.redis_dts.models import TbTendisDTSJob, TbTendisDtsTask
 from backend.db_services.redis.redis_dts.util import get_safe_regex_pattern
-from backend.db_services.redis.util import is_predixy_proxy_type, is_redis_cluster_protocal
+from backend.db_services.redis.util import is_predixy_proxy_type, is_redis_cluster_protocal, is_twemproxy_proxy_type
 from backend.flow.consts import GB, MB, StateType
 from backend.flow.engine.bamboo.scene.redis.redis_cluster_data_check_repair import RedisClusterDataCheckRepairFlow
 from backend.flow.engine.bamboo.scene.redis.redis_cluster_shutdown import RedisClusterShutdownFlow
@@ -949,13 +949,10 @@ def _execute(self, data, parent_data):
                 ticket_data["proxy_admin_pwd"] = ticket_data["proxy_pwd"]
         self.log_info("NewDstClusterInstallJobAndWatchStatus ticket_data==>:{}".format(ticket_data))
         root_id = generate_root_id()
-        if ticket_data["cluster_type"] == ClusterType.TendisPredixyTendisplusCluster.value:
+        if is_predixy_proxy_type(ticket_data["cluster_type"]):
             flow = TendisPlusApplyFlow(root_id=root_id, data=ticket_data)
             flow.deploy_predixy_cluster_flow()
-        elif ticket_data["cluster_type"] == ClusterType.TendisTwemproxyRedisInstance.value:
-            flow = RedisClusterApplyFlow(root_id=root_id, data=ticket_data)
-            flow.deploy_twemproxy_cluster_flow()
-        elif ticket_data["cluster_type"] == ClusterType.TwemproxyTendisSSDInstance.value:
+        elif is_twemproxy_proxy_type(ticket_data["cluster_type"]):
             flow = RedisClusterApplyFlow(root_id=root_id, data=ticket_data)
             flow.deploy_twemproxy_cluster_flow()
         else: