From 623191ca79471cb7b3973adeeee6927481fb2f40 Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Wed, 25 Dec 2024 19:41:18 +0800 Subject: [PATCH] ddl: fix version syncer doesn't print who hasn't synced on partial sync (#58511) close pingcap/tidb#58480 --- pkg/ddl/schemaver/syncer.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/ddl/schemaver/syncer.go b/pkg/ddl/schemaver/syncer.go index bdccc52df5..d82a6bbab0 100644 --- a/pkg/ddl/schemaver/syncer.go +++ b/pkg/ddl/schemaver/syncer.go @@ -370,15 +370,15 @@ func (s *etcdSyncer) WaitVersionSynced(ctx context.Context, jobID int64, latestV // Check all schema versions. if variable.EnableMDL.Load() { notifyCh := make(chan struct{}) - var unmatchedNodeID atomic.Pointer[string] + var unmatchedNodeInfo atomic.Pointer[string] matchFn := func(nodeVersions map[string]int64) bool { - if len(nodeVersions) < len(updatedMap) { + if len(nodeVersions) == 0 { return false } - for tidbID := range updatedMap { + for tidbID, info := range updatedMap { if nodeVer, ok := nodeVersions[tidbID]; !ok || nodeVer < latestVer { - id := tidbID - unmatchedNodeID.Store(&id) + linfo := info + unmatchedNodeInfo.Store(&linfo) return false } } @@ -394,9 +394,9 @@ func (s *etcdSyncer) WaitVersionSynced(ctx context.Context, jobID int64, latestV return errors.Trace(ctx.Err()) case <-time.After(time.Second): item.clearMatchFn() - if id := unmatchedNodeID.Load(); id != nil { + if info := unmatchedNodeInfo.Load(); info != nil { logutil.DDLLogger().Info("syncer check all versions, someone is not synced", - zap.String("info", *id), + zap.String("info", *info), zap.Int64("ddl job id", jobID), zap.Int64("ver", latestVer)) } else {