diff --git a/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/redis_backup.go b/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/redis_backup.go index b25b0cc3f2..574f8db49f 100644 --- a/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/redis_backup.go +++ b/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/redis_backup.go @@ -181,9 +181,12 @@ func (job *RedisBackup) Run() (err error) { // 如果是永久备份,那么需要检查上传结果情况 // 结束时间依赖上传时间最长的那个,所以没必要去并发探测 if job.params.BackupType == consts.ForeverBackupType { - job.runtime.Logger.Info(fmt.Sprintf("backup type is[%s], check upload status, task ids [%+v]", + job.runtime.Logger.Info(fmt.Sprintf("backup type is[%s], check upload status, task ids %+v", job.params.BackupType, bakTaskIDs)) for _, taskId := range bakTaskIDs { + if strings.TrimSpace(taskId) == "" { + continue + } // 半个小时还没上传成功则认为失败了 for i := 0; i < 60; i++ { // taskStatus>4,上传失败; diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_ins_shutdown.py b/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_ins_shutdown.py index 0b64fb33fc..98ea0aa31e 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_ins_shutdown.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_ins_shutdown.py @@ -161,13 +161,9 @@ def redis_ins_shutdown_flow(self): acts_list = [] for ins_info in all_ins_info["ins_info_list"]: act_kwargs.exec_ip = ins_info["master_ip"] - act_kwargs.cluster["bk_biz_id"] = str(self.data["bk_biz_id"]) - act_kwargs.cluster["backup_host"] = ins_info["master_ip"] - act_kwargs.cluster["backup_instances"] = [ins_info["port"]] - act_kwargs.cluster["ssd_log_count"] = {} - act_kwargs.cluster["immute_domain"] = ins_info["domain_name"] + act_kwargs.cluster["domain_name"] = ins_info["domain_name"] - act_kwargs.get_redis_payload_func = RedisActPayload.redis_cluster_backup_4_scene.__name__ + act_kwargs.get_redis_payload_func = RedisActPayload.redis_cluster_backup_payload.__name__ acts_list.append( { "act_name": _("redis备份: {}").format(ins_info["domain_name"]), diff --git a/dbm-ui/backend/flow/utils/redis/redis_act_playload.py b/dbm-ui/backend/flow/utils/redis/redis_act_playload.py index c6dfa44edb..e766f90023 100644 --- a/dbm-ui/backend/flow/utils/redis/redis_act_playload.py +++ b/dbm-ui/backend/flow/utils/redis/redis_act_playload.py @@ -929,7 +929,11 @@ def redis_cluster_backup_payload(self, **kwargs) -> dict: redis集群备份 """ ip = kwargs["ip"] - cluster = Cluster.objects.get(immute_domain=self.cluster["domain_name"]) + if "params" in kwargs and "domain_name" in kwargs["params"]: + domain_name = kwargs["params"]["domain_name"] + else: + domain_name = self.cluster["domain_name"] + cluster = Cluster.objects.get(immute_domain=domain_name) return { "db_type": DBActuatorTypeEnum.Redis.value, "action": DBActuatorTypeEnum.Redis.value + "_" + RedisActuatorActionEnum.Backup.value, @@ -939,7 +943,7 @@ def redis_cluster_backup_payload(self, **kwargs) -> dict: "ip": ip, "ports": self.cluster[ip], "backup_type": self.cluster["backup_type"], - "domain": self.cluster["domain_name"], + "domain": domain_name, "without_to_backup_sys": not BACKUP_SYS_STATUS, "backup_client_storage_type": "", # 留空,使用系统默认 },