From c48973e5e298f26c33578b80bb0be95c933cb53b Mon Sep 17 00:00:00 2001 From: OMG-By <504094596@qq.com> Date: Fri, 10 Jan 2025 14:15:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(redis):=20=E6=89=A9=E5=AE=B9=E5=8D=95?= =?UTF-8?q?=E6=8D=AEssd=E7=89=88=E6=9C=AC=E6=8A=A5=E9=94=99=20#9026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bamboo/scene/redis/redis_backend_scale.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_backend_scale.py b/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_backend_scale.py index cc08612380..46b8a12d88 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_backend_scale.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_backend_scale.py @@ -54,6 +54,7 @@ from backend.flow.utils.redis.redis_context_dataclass import ActKwargs, CommonContext, DnsKwargs from backend.flow.utils.redis.redis_db_meta import RedisDBMeta from backend.flow.utils.redis.redis_proxy_util import get_cluster_info_by_cluster_id +from backend.flow.utils.redis.redis_util import version_ge logger = logging.getLogger("flow") @@ -590,15 +591,10 @@ def redis_backend_scale_flow(self): ) # > 4.0 版本需要重做一下slave，否则可能会丢数据 - big_version = int(str.split(act_kwargs.cluster["db_version"], "-")[1]) - if ( - act_kwargs.cluster["cluster_type"] - in [ - ClusterType.TendisRedisInstance.value, - ClusterType.TendisTwemproxyRedisInstance.value, - ] - and big_version >= 4 - ): + if act_kwargs.cluster["cluster_type"] in [ + ClusterType.TendisRedisInstance.value, + ClusterType.TendisTwemproxyRedisInstance.value, + ] and version_ge(act_kwargs.cluster["db_version"], "4"): sub_pipeline.add_parallel_acts(acts_list=self.redis_local_redo_dr(act_kwargs, sync_relations)) sub_pipeline.add_act(act_name=_("Redis-人工确认"), act_component_code=PauseComponent.code, kwargs={})