From 371e486c770ffd698c689f02f60cc9b89df320d4 Mon Sep 17 00:00:00 2001 From: OMG-By <504094596@qq.com> Date: Thu, 14 Nov 2024 15:32:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(redis):=20=E5=A4=87=E4=BB=BD=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=B1=E8=B4=A5=E4=BD=86=E6=98=AFflow=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98=20#7899?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-services/redis/redis-dts/util/util.go | 1 - .../redis/redis_dts/models/tb_tendis_dts_task.py | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dbm-services/redis/redis-dts/util/util.go b/dbm-services/redis/redis-dts/util/util.go index 97433db100..9335dfbc18 100644 --- a/dbm-services/redis/redis-dts/util/util.go +++ b/dbm-services/redis/redis-dts/util/util.go @@ -213,7 +213,6 @@ func LookupDbDNSIPs(addr01 string) (addrs []string, err error) { } ipPart := list01[0] portPart := list01[1] - // TODO 这个地方会卡16分钟，后面需要想一下怎么更好的区优化 if IsDbDNS(ipPart) { uniqMap := make(map[string]bool) var idx int diff --git a/dbm-ui/backend/db_services/redis/redis_dts/models/tb_tendis_dts_task.py b/dbm-ui/backend/db_services/redis/redis_dts/models/tb_tendis_dts_task.py index b65b34120c..e467ffc25b 100644 --- a/dbm-ui/backend/db_services/redis/redis_dts/models/tb_tendis_dts_task.py +++ b/dbm-ui/backend/db_services/redis/redis_dts/models/tb_tendis_dts_task.py @@ -55,12 +55,8 @@ class TbTendisDtsTask(models.Model): dst_password = models.CharField(max_length=128, default="", verbose_name=_("目的密码base64值")) # task类型,当前迁移任务到哪个阶段,包含tendis_backup, backupfile_fetch,tendisdump,sql_impoter,make_sync等 task_type = models.CharField(max_length=128, default="", verbose_name=_("task类型")) - tendisbackup_file = models.CharField( - null=True, blank=True, max_length=512, default="", verbose_name=_("tendisssd slave上bakup文件位置") - ) - fetch_file = models.CharField( - null=True, blank=True, default="", max_length=512, verbose_name=_("backup文件拉取到dts_server本地位置") - ) + tendisbackup_file = models.CharField(max_length=512, default="", verbose_name=_("tendisssd slave上bakup文件位置")) + fetch_file = models.CharField(default="", max_length=512, verbose_name=_("backup文件拉取到dts_server本地位置")) sqlfile_dir = models.CharField(default="", max_length=512, verbose_name=_("tendisdumper得到的sql文件夹")) syncer_port = models.IntegerField(default=0, verbose_name=_("redis-sync端口")) syncer_pid = models.IntegerField(default=0, verbose_name=_("sync的进程id"))