Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (r *TableSchemaCheckComp) Init() (err error) {
r.tdbCtlConn = &native.TdbctlDbWork{DbWorker: *conn}
r.xconn, err = r.tdbCtlConn.GetSqlxDb().Connx(context.Background())
if err != nil {
logger.Error("get xconn error: %v")
logger.Error("get xconn error: %v", err)
return err
}
// init checksum table schema
Expand Down Expand Up @@ -175,7 +175,9 @@ func (r *TableSchemaCheckComp) atomUpdateDbTables(dbName string) (err error) {
inconsistentMap[item.Table] = append(inconsistentMap[item.Table], item)
}
for tbName, results := range inconsistentMap {
if err = r.atomUpdateCheckResult(dbName, tbName, results); err == nil {
if err = r.atomUpdateCheckResult(dbName, tbName, results); err != nil {
logger.Error("update %s.%s checkresult failed: %v", dbName, tbName, err)
} else {
logger.Info("update %s.%s checkresult ok", dbName, tbName)
}
}
Expand Down Expand Up @@ -226,7 +228,7 @@ func (r *TableSchemaCheckComp) atomUpdateCheckResult(db, tbl string, inconsisten
status := native.SchemaCheckOk
checkResult := []byte("{}")
if len(inconsistentItems) > 0 {
logger.Warn("tabel %s.%s has inconsistent items", db, tbl)
logger.Warn("table %s.%s has inconsistent items", db, tbl)
status = ""
checkResult, err = json.Marshal(inconsistentItems)
if err != nil {
Expand All @@ -239,7 +241,7 @@ func (r *TableSchemaCheckComp) atomUpdateCheckResult(db, tbl string, inconsisten
tbl, status,
checkResult,
time.Now()); err != nil {
logger.Error("replace checksum record failed", err)
logger.Error("replace checksum record failed: %v", err)
return
}
return
Expand Down