Skip to content

[slack-19.0]: Backport buffering logging #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tanjinx merged 2 commits into from
Dec 29, 2025
Merged

[slack-19.0]: Backport buffering logging #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5038f05
Improve logging in buffering (#17294)
GuptaManan100 Dec 9, 2024
2659d12
Improve vtgate logging for buffering (#17654)
deepthi Jan 30, 2025
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
11 changes: 5 additions & 6 deletions go/vt/discovery/keyspace_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ func (kss *keyspaceState) ensureConsistentLocked() {
// watcher. this means the ongoing availability event has been resolved, so we can broadcast
// a resolution event to all listeners
kss.consistent = true
log.Infof("keyspace %s is now consistent", kss.keyspace)

kss.moveTablesState = nil

Expand All @@ -330,12 +331,10 @@ func (kss *keyspaceState) ensureConsistentLocked() {
Serving: 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,
// )
log.V(2).Infof("keyspace event resolved: %s is now consistent (serving: %t)",
topoproto.KeyspaceShardString(sstate.target.Keyspace, sstate.target.Shard),
sstate.serving,
)

if !sstate.serving {
delete(kss.shards, shard)
Expand Down
1 change: 1 addition & 0 deletions go/vt/vtgate/buffer/buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ func (b *Buffer) WaitForFailoverEnd(ctx context.Context, keyspace, shard string,
}

func (b *Buffer) HandleKeyspaceEvent(ksevent *discovery.KeyspaceEvent) {
log.Infof("Keyspace Event received for keyspace %v", ksevent.Keyspace)
for _, shard := range ksevent.Shards {
sb := b.getOrCreateBuffer(shard.Target.Keyspace, shard.Target.Shard)
if sb != nil {
Expand Down
6 changes: 2 additions & 4 deletions go/vt/vtgate/buffer/shard_buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,10 +489,8 @@ func (sb *shardBuffer) recordKeyspaceEvent(alias *topodatapb.TabletAlias, stillS
sb.mu.Lock()
defer sb.mu.Unlock()

// 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)
log.V(2).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 {
Expand Down
Loading