Skip to content

Commit 74650dd

Browse files
committed
fix(backend): fix(dbactuator): 修复 table_schema_check 中的 logger 参数缺失、错误吞噬等 bug #16464
1 parent 3ad2484 commit 74650dd

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

dbm-services/mysql/db-tools/dbactuator/pkg/components/spiderctl/table_schema_check.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (r *TableSchemaCheckComp) Init() (err error) {
9797
r.tdbCtlConn = &native.TdbctlDbWork{DbWorker: *conn}
9898
r.xconn, err = r.tdbCtlConn.GetSqlxDb().Connx(context.Background())
9999
if err != nil {
100-
logger.Error("get xconn error: %v")
100+
logger.Error("get xconn error: %v", err)
101101
return err
102102
}
103103
// init checksum table schema
@@ -175,7 +175,9 @@ func (r *TableSchemaCheckComp) atomUpdateDbTables(dbName string) (err error) {
175175
inconsistentMap[item.Table] = append(inconsistentMap[item.Table], item)
176176
}
177177
for tbName, results := range inconsistentMap {
178-
if err = r.atomUpdateCheckResult(dbName, tbName, results); err == nil {
178+
if err = r.atomUpdateCheckResult(dbName, tbName, results); err != nil {
179+
logger.Error("update %s.%s checkresult failed: %v", dbName, tbName, err)
180+
} else {
179181
logger.Info("update %s.%s checkresult ok", dbName, tbName)
180182
}
181183
}
@@ -226,7 +228,7 @@ func (r *TableSchemaCheckComp) atomUpdateCheckResult(db, tbl string, inconsisten
226228
status := native.SchemaCheckOk
227229
checkResult := []byte("{}")
228230
if len(inconsistentItems) > 0 {
229-
logger.Warn("tabel %s.%s has inconsistent items", db, tbl)
231+
logger.Warn("table %s.%s has inconsistent items", db, tbl)
230232
status = ""
231233
checkResult, err = json.Marshal(inconsistentItems)
232234
if err != nil {
@@ -239,7 +241,7 @@ func (r *TableSchemaCheckComp) atomUpdateCheckResult(db, tbl string, inconsisten
239241
tbl, status,
240242
checkResult,
241243
time.Now()); err != nil {
242-
logger.Error("replace checksum record failed", err)
244+
logger.Error("replace checksum record failed: %v", err)
243245
return
244246
}
245247
return

0 commit comments

Comments
 (0)