Skip to content

Fix sporadic TestServingKeyspaces panic on context cancellation #19163

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
arthurschreiber merged 1 commit into from
Jan 20, 2026
Merged

Fix sporadic TestServingKeyspaces panic on context cancellation #19163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion go/vt/vtgate/sandbox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,19 +298,35 @@ func (sct *sandboxTopo) WatchSrvVSchema(ctx context.Context, cell string, callba
return
}

// Context may already be canceled during test cleanup - exit gracefully.
if ctx.Err() != nil {
return
}

// Update the backing topo server with the current sandbox vschemas.
for ks := range ksToSandbox {
ksvs := &topo.KeyspaceVSchemaInfo{
Name: ks,
Keyspace: srvVSchema.Keyspaces[ks],
}
if err := sct.topoServer.SaveVSchema(ctx, ksvs); err != nil {
if ctx.Err() != nil {
return
}
panic(fmt.Sprintf("sandboxTopo SaveVSchema returned an error: %v", err))
}
}
sct.topoServer.UpdateSrvVSchema(ctx, cell, srvVSchema)
if err := sct.topoServer.UpdateSrvVSchema(ctx, cell, srvVSchema); err != nil {
if ctx.Err() != nil {
return
}
panic(fmt.Sprintf("sandboxTopo UpdateSrvVSchema returned an error: %v", err))
}
current, updateChan, err := sct.topoServer.WatchSrvVSchema(ctx, cell)
if err != nil {
if ctx.Err() != nil {
return
}
panic(fmt.Sprintf("sandboxTopo WatchSrvVSchema returned an error: %v", err))
}
if !callback(current.Value, nil) {
Expand Down
Loading