Skip to content

release-25.1: distsql: cancel remote flows on quiesce #146574

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
merged 1 commit into from
May 13, 2025
Merged

release-25.1: distsql: cancel remote flows on quiesce #146574

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
4 changes: 4 additions & 0 deletions pkg/sql/distsql/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,10 @@ func (ds *ServerImpl) SetupFlow(
// Note: the passed context will be canceled when this RPC completes, so we
// can't associate it with the flow since it outlives the RPC.
ctx = ds.AnnotateCtx(context.Background())
// Ensure that the flow respects the node being shut down. Note that since
// the flow outlives the RPC, we cannot defer the cancel function, so we
// simply ignore it.
ctx, _ = ds.Stopper.WithCancelOnQuiesce(ctx)
if err := func() error {
// Reserve some memory for this remote flow which is a poor man's
// admission control based on the RAM usage.
Expand Down