Skip to content
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

Improve vtgate logging for buffering #17654

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Improve vtgate logging for buffering #17654

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
b5de7b1
move buffering logs back to default level
deepthi Jan 29, 2025
74a413c
suppress keyspace event resolved logging for every shard
deepthi Jan 29, 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
3 changes: 2 additions & 1 deletion go/vt/discovery/keyspace_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,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 @@ -328,7 +329,7 @@ func (kss *keyspaceState) ensureConsistentLocked() {
Serving: sstate.serving,
})

log.Infof("keyspace event resolved: %s is now consistent (serving: %t)",
log.V(2).Infof("keyspace event resolved: %s is now consistent (serving: %t)",
topoproto.KeyspaceShardString(sstate.target.Keyspace, sstate.target.Shard),
sstate.serving,
)
Expand Down
6 changes: 3 additions & 3 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 @@ -286,7 +286,7 @@ func (sb *shardBuffer) startBufferingLocked(ctx context.Context, kev *discovery.
msg = "Dry-run: Would have started buffering"
}
starts.Add(sb.statsKey, 1)
log.V(2).Infof("%v for shard: %s (window: %v, size: %v, max failover duration: %v) (A failover was detected by this seen error: %v.)",
log.Infof("%v for shard: %s (window: %v, size: %v, max failover duration: %v) (A failover was detected by this seen error: %v.)",
msg,
topoproto.KeyspaceShardString(sb.keyspace, sb.shard),
sb.buf.config.Window,
Expand Down Expand Up @@ -562,7 +562,7 @@ func (sb *shardBuffer) stopBufferingLocked(reason stopReason, details string) {
if sb.mode == bufferModeDryRun {
msg = "Dry-run: Would have stopped buffering"
}
log.V(2).Infof("%v for shard: %s after: %.1f seconds due to: %v. Draining %d buffered requests now.",
log.Infof("%v for shard: %s after: %.1f seconds due to: %v. Draining %d buffered requests now.",
msg, topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d.Seconds(), details, len(q))

var clientEntryError error
Expand Down Expand Up @@ -622,7 +622,7 @@ func (sb *shardBuffer) drain(q []*entry, err error) {
wg.Wait()

d := sb.timeNow().Sub(start)
log.V(2).Infof("Draining finished for shard: %s Took: %v for: %d requests.", topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d, len(q))
log.Infof("Draining finished for shard: %s Took: %v for: %d requests.", topoproto.KeyspaceShardString(sb.keyspace, sb.shard), d, len(q))
requestsDrained.Add(sb.statsKey, int64(len(q)))

// Draining is done. Change state from "draining" to "idle".
Expand Down
Loading