fix(mysql): mysql-backup-param-error #6903

TencentBlueKing · Sep 13, 2024 · 9c97368 · 9c97368
1 parent a08e5dc
commit 9c97368
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/backupdemand/backup_demand.go b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/backupdemand/backup_demand.go
@@ -155,7 +155,7 @@ func (c *Component) GenerateBackupConfig() error {
 			ignoreDbs = append(ignoreDbs, c.Params.IgnoreDbs...)
 			backupConfig.LogicalBackup.Databases = strings.Join(c.Params.DbPatterns, ",")
 			backupConfig.LogicalBackup.ExcludeDatabases = strings.Join(ignoreDbs, ",")
-			backupConfig.LogicalBackup.Tables = strings.Join(c.Params.IgnoreTables, ",")
+			backupConfig.LogicalBackup.Tables = strings.Join(c.Params.TablePatterns, ",")
 			backupConfig.LogicalBackup.ExcludeTables = strings.Join(c.Params.IgnoreTables, ",")
 
 			tf, err := db_table_filter.NewFilter(

diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/get_binlog_backup.py b/dbm-ui/backend/flow/engine/bamboo/scene/mysql/common/get_binlog_backup.py
@@ -19,7 +19,7 @@
 
 
 def get_backup_binlog(
-        cluster_id: int, start_time: datetime, end_time: datetime, binlog_info: dict, minute_range=30
+    cluster_id: int, start_time: datetime, end_time: datetime, binlog_info: dict, minute_range=30
 ) -> dict:
     result = {}
     if start_time > end_time:

diff --git a/dbm-ui/backend/flow/utils/mysql/mysql_act_playload.py b/dbm-ui/backend/flow/utils/mysql/mysql_act_playload.py
@@ -1861,9 +1861,9 @@ def mysql_backup_demand_payload(self, **kwargs):
                     "custom_backup_dir": self.ticket_data.get("custom_backup_dir", ""),
                     "shard_id": self.ticket_data.get("shard_id", 0),
                     "backup_file_tag": self.ticket_data.get("file_tag", ""),
-                    "db_patterns": self.ticket_data.get("db_patterns", ""),
+                    "db_patterns": self.ticket_data.get("db_patterns", ["*"]),
                     "ignore_dbs": self.ticket_data.get("ignore_dbs", ""),
-                    "table_patterns": self.ticket_data.get("table_patterns", ""),
+                    "table_patterns": self.ticket_data.get("table_patterns", ["*"]),
                     "ignore_tables": self.ticket_data.get("ignore_tables", ""),
                 },
             },