Merge branch 'slack-19.0' into bp-pr17124.slack-19.0

slackhq · Nov 8, 2024 · a3f1eb5 · a3f1eb5
2 parents a63d74c + af8c452
commit a3f1eb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/go/vt/discovery/keyspace_events.go b/go/vt/discovery/keyspace_events.go
@@ -312,10 +312,12 @@ func (kss *keyspaceState) ensureConsistentLocked() {
 			Serving: sstate.serving,
 		})
 
-		log.Infof("keyspace event resolved: %s/%s is now consistent (serving: %v)",
-			sstate.target.Keyspace, sstate.target.Keyspace,
-			sstate.serving,
-		)
+		// Disable it due to log storm in production
+		// thread https://slack-pde.slack.com/archives/C06CPL4HMED/p1729896804879749
+		// log.Infof("keyspace event resolved: %s/%s is now consistent (serving: %v)",
+		//	sstate.target.Keyspace, sstate.target.Keyspace,
+		//	sstate.serving,
+		// )
 
 		if !sstate.serving {
 			delete(kss.shards, shard)

diff --git a/go/vt/vtgate/buffer/shard_buffer.go b/go/vt/vtgate/buffer/shard_buffer.go
@@ -475,8 +475,10 @@ func (sb *shardBuffer) recordKeyspaceEvent(alias *topodatapb.TabletAlias, stillS
 	sb.mu.Lock()
 	defer sb.mu.Unlock()
 
-	log.Infof("disruption in shard %s/%s resolved (serving: %v), movetable state %#v",
-		sb.keyspace, sb.shard, stillServing, keyspaceEvent.MoveTablesState)
+	// Disable it due to log storm in production
+	// thread https://slack-pde.slack.com/archives/C06CPL4HMED/p1729896804879749
+	// log.Infof("disruption in shard %s/%s resolved (serving: %v), movetable state %#v",
+	//	sb.keyspace, sb.shard, stillServing, keyspaceEvent.MoveTablesState)
 
 	if !topoproto.TabletAliasEqual(alias, sb.currentPrimary) {
 		if sb.currentPrimary != nil {