database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store/gcworker: reduce "full config reset" log on pd side (#44331)

Browse Source 
close pingcap/tidb#33069
This commit is contained in:
tiancaiamao
2023-06-01 16:54:42 +08:00
committed by GitHub
parent 907b6ca3cc
commit ea2e9b6aed
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
store/gcworker/gc_worker.go
View File

@ -2190,20 +2190,20 @@ func (w *GCWorker) doGCPlacementRules(se session.Session, safePoint uint64, dr u
}
}
// Skip table ids that's already successfully handled.
tmp := physicalTableIDs[:0]
for _, id := range physicalTableIDs {
if _, ok := gcPlacementRuleCache[id]; !ok {
tmp = append(tmp, id)
}
}
physicalTableIDs = tmp
if len(physicalTableIDs) == 0 {
return
}
bundles := make([]*placement.Bundle, 0, len(physicalTableIDs))
for _, id := range physicalTableIDs {
bundles = append(bundles, placement.NewBundle(id))
}
for _, id := range physicalTableIDs {
// Skip table ids that's already successfully deleted.
if _, ok := gcPlacementRuleCache[id]; ok {
continue
}
// Delete pd rule
failpoint.Inject("gcDeletePlacementRuleCounter", func() {})
logutil.BgLogger().Info("try delete TiFlash pd rule",
@ -2212,12 +2212,22 @@ func (w *GCWorker) doGCPlacementRules(se session.Session, safePoint uint64, dr u
if err := infosync.DeleteTiFlashPlacementRule(context.Background(), "tiflash", ruleID); err != nil {
logutil.BgLogger().Error("delete TiFlash pd rule failed when gc",
zap.Error(err), zap.String("ruleID", ruleID), zap.Uint64("safePoint", safePoint))
} else {
// Cache the table id if its related rule are deleted successfully.
gcPlacementRuleCache[id] = struct{}{}
}
}
return infosync.PutRuleBundlesWithDefaultRetry(context.TODO(), bundles)
bundles := make([]*placement.Bundle, 0, len(physicalTableIDs))
for _, id := range physicalTableIDs {
bundles = append(bundles, placement.NewBundle(id))
}
err = infosync.PutRuleBundlesWithDefaultRetry(context.TODO(), bundles)
if err != nil {
return
}
// Cache the table id if its related rule are deleted successfully.
for _, id := range physicalTableIDs {
gcPlacementRuleCache[id] = struct{}{}
}
return nil
}
func (w *GCWorker) doGCLabelRules(dr util.DelRangeTask) (err error) {