snapshot(ticdc): fix ddl puller and ddl manager stuck caused by dead …

…lock (#11886) (#11889) close #11884
pingcap · Dec 17, 2024 · 0c88977 · 0c88977
1 parent 9d7482a
commit 0c88977
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cdc/entry/schema/snapshot.go b/cdc/entry/schema/snapshot.go
@@ -561,9 +561,6 @@ func (s *Snapshot) SchemaCount() (count int) {
 
 // DumpToString dumps the snapshot to a string.
 func (s *Snapshot) DumpToString() string {
-	s.rwlock.RLock()
-	defer s.rwlock.RUnlock()
-
 	schemas := make([]string, 0, s.inner.schemas.Len())
 	s.IterSchemas(func(dbInfo *timodel.DBInfo) {
 		schemas = append(schemas, fmt.Sprintf("%v", dbInfo))

diff --git a/cdc/entry/schema_storage.go b/cdc/entry/schema_storage.go
@@ -272,8 +272,7 @@ func (s *schemaStorage) AllPhysicalTables(ctx context.Context, ts model.Ts) ([]m
 	log.Debug("get new schema snapshot",
 		zap.Uint64("ts", ts),
 		zap.Uint64("snapTs", snap.CurrentTs()),
-		zap.Any("tables", res),
-		zap.String("snapshot", snap.DumpToString()))
+		zap.Any("tables", res))
 
 	return res, nil
 }