fix(backend): mysql 定点回档参数调整 #1666

TencentBlueKing · Nov 6, 2023 · 0d495c1 · 0d495c1
1 parent c24e765
commit 0d495c1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dbm-ui/backend/db_services/mysql/fixpoint_rollback/handlers.py b/dbm-ui/backend/db_services/mysql/fixpoint_rollback/handlers.py
@@ -351,7 +351,7 @@ def query_backup_log_from_bklog(self, start_time: str, end_time: str) -> List[Di
             collector="mysql_backup_result",
             start_time=start_time,
             end_time=end_time,
-            query_string=f'log: "cluster_address: \\"{cluster_domain}\\""',
+            query_string=f'log: "cluster_id: \\"{self.cluster.id}\\""',
         )
 
         if self.cluster.cluster_type == ClusterType.TenDBCluster:

diff --git a/dbm-ui/backend/dbm_init/medium/Dockerfile b/dbm-ui/backend/dbm_init/medium/Dockerfile
@@ -33,7 +33,7 @@ FROM go-mod-builder as redis-medium-builder
 ## 构建redis介质
 RUN set -ex && \
     cd /blueking-dbm/dbm-services/redis/db-tools/dbactuator && make -j4 && \
-    cd /blueking-dbm/dbm-services/redis/db-tools/dbmon && sh package.sh
+    cd /blueking-dbm/dbm-services/redis/db-tools/dbmon && bash package.sh
 
 
 FROM go-mod-builder as bigdata-medium-builder

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_rollback_data_sub_flow.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/mysql_rollback_data_sub_flow.py
@@ -28,6 +28,7 @@
 )
 from backend.flow.plugins.components.collections.mysql.mysql_rollback_data_download_binlog import (
     MySQLRollbackDownloadBinlog,
+    MySQLRollbackDownloadBinlogComponent,
 )
 from backend.flow.plugins.components.collections.mysql.rollback_local_trans_flies import (
     RollBackLocalTransFileComponent,
@@ -173,7 +174,7 @@ def rollback_local_and_time(root_id: str, ticket_data: dict, cluster_info: dict)
     )
     sub_pipeline.add_act(
         act_name=_("下载定点恢复的binlog到{}").format(cluster_info["rollback_ip"]),
-        act_component_code=MySQLRollbackDownloadBinlog.code,
+        act_component_code=MySQLRollbackDownloadBinlogComponent.code,
         kwargs=asdict(download_kwargs),
     )
 
@@ -340,14 +341,13 @@ def rollback_local_and_backupid(root_id: str, ticket_data: dict, cluster_info: d
 
     exec_act_kwargs.exec_ip = cluster_info["rollback_ip"]
     exec_act_kwargs.cluster = cluster_info
-    task_ids = [i["task_id"] for i in backupinfo["file_list_details"]]
     sub_pipeline.add_act(
         act_name=_("传输文件{}").format(cluster_info["rollback_ip"]),
         act_component_code=RollBackLocalTransFileComponent.code,
         kwargs=asdict(
             RollBackTransFileKwargs(
                 bk_cloud_id=cluster_info["bk_cloud_id"],
-                file_list=task_ids,
+                file_list=[],
                 file_target_path=cluster_info["file_target_path"],
                 source_ip_list=[],
                 exec_ip=cluster_info["rollback_ip"],

diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
@@ -79,5 +79,5 @@ dependencies:
 description: A Helm chart for bkdbm
 name: bk-dbm
 type: application
-version: 1.2.0-alpha.77
-appVersion: 1.2.0-alpha.77
+version: 1.2.0-alpha.78
+appVersion: 1.2.0-alpha.78
diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.2.0-alpha.444
+appVersion: 1.2.0-alpha.449
 description: A Helm chart for dbm
 name: dbm
 type: application