fix(redis): 回档job超时 TencentBlueKing#7571

zfrendo · Nov 5, 2024 · fa6e17f · fa6e17f
1 parent b281ed6
commit fa6e17f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/dbm-services/redis/db-tools/dbactuator/pkg/backupsys/tendisSSD_incrback.go b/dbm-services/redis/db-tools/dbactuator/pkg/backupsys/tendisSSD_incrback.go
@@ -1158,7 +1158,9 @@ func (incr *TredisRocksDBIncrBack) ImportOneBinlogToTredis(tplusIP string, tplus
 	// NOCC:tosa/linelength(设计如此)
 	importCmd := fmt.Sprintf("%s --no-raw --no-auth-warning -h %s -p %d -a %s < %s > %s", consts.RedisCliBin, tplusIP, tplusPort,
 		tplusPasswd, cmdfile, outfile)
-	mylog.Logger.Info("binlog 写入命令:%v", importCmd)
+	importFmtCmd := fmt.Sprintf("%s --no-raw --no-auth-warning -h %s -p %d -a xxxx < %s > %s", consts.RedisCliBin, tplusIP, tplusPort,
+		cmdfile, outfile)
+	mylog.Logger.Info("binlog 写入命令:%v", importFmtCmd)
 	_, err = util.RunLocalCmd("bash", []string{"-c", importCmd}, "", nil, 1*time.Hour)
 	if err != nil {
 		mylog.Logger.Error(fmt.Sprintf("导入binlog 命令失败,详情:%v", err))

diff --git a/dbm-services/redis/db-tools/dbactuator/pkg/datastructure/tendisSSD_incrback.go b/dbm-services/redis/db-tools/dbactuator/pkg/datastructure/tendisSSD_incrback.go
@@ -1081,7 +1081,9 @@ func (incr *TredisRocksDBIncrBack) ImportOneBinlogToTredis(tplusIP string, tplus
 	// NOCC:tosa/linelength(设计如此)
 	importCmd := fmt.Sprintf("%s --no-raw --no-auth-warning -h %s -p %d -a %s < %s > %s", consts.RedisCliBin, tplusIP, tplusPort,
 		tplusPasswd, cmdfile, outfile)
-	mylog.Logger.Info("binlog 写入命令:%v", importCmd)
+	importFmtCmd := fmt.Sprintf("%s --no-raw --no-auth-warning -h %s -p %d -a xxxx < %s > %s", consts.RedisCliBin, tplusIP, tplusPort,
+		cmdfile, outfile)
+	mylog.Logger.Info("binlog 写入命令:%v", importFmtCmd)
 	_, err = util.RunLocalCmd("bash", []string{"-c", importCmd}, "", nil, 1*time.Hour)
 	if err != nil {
 		mylog.Logger.Error(fmt.Sprintf("导入binlog 命令失败,详情:%v", err))

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/redis/atom_jobs/redis_makesync.py b/dbm-ui/backend/flow/engine/bamboo/scene/redis/atom_jobs/redis_makesync.py
@@ -248,8 +248,8 @@ def backup_and_restore(
     act_kwargs.cluster["backup_instances"] = []
     act_kwargs.cluster["ssd_log_count"] = {
         "log-count": 600000,
-        "log-keep-count": 7650000,
-        "slave-log-keep-count": 7650000,
+        "log-keep-count": 20000000,
+        "slave-log-keep-count": 20000000,
     }
     act_kwargs.cluster["domain_name"] = act_kwargs.cluster["immute_domain"]
     for sync_direct in params["ins_link"]:

diff --git a/.../backend/flow/plugins/components/collections/redis/exec_data_structure_actuator_script.py b/.../backend/flow/plugins/components/collections/redis/exec_data_structure_actuator_script.py
@@ -124,6 +124,7 @@ def _execute(self, data, parent_data) -> bool:
             "script_content": base64_encode(template.render(db_act_template)),
             "script_language": 1,
             "target_server": {"ip_list": target_ip_info},
+            "timeout": 86400,
         }
 
         self.log_info(