Skip to content

fix(runaway): ensure DistSQLContext's checker is synchronized with session variables (#61907) #62220

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
ti-chi-bot merged 1 commit into from
Jul 8, 2025
Merged

fix(runaway): ensure DistSQLContext's checker is synchronized with session variables (#61907) #62220

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
12 changes: 11 additions & 1 deletion pkg/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,7 @@ func (s *session) GetDistSQLCtx() *distsqlctx.DistSQLContext {
vars := s.GetSessionVars()
sc := vars.StmtCtx

return sc.GetOrInitDistSQLFromCache(func() *distsqlctx.DistSQLContext {
dctx := sc.GetOrInitDistSQLFromCache(func() *distsqlctx.DistSQLContext {
return &distsqlctx.DistSQLContext{
WarnHandler: sc.WarnHandler,
InRestrictedSQL: sc.InRestrictedSQL,
Expand Down Expand Up @@ -2651,6 +2651,16 @@ func (s *session) GetDistSQLCtx() *distsqlctx.DistSQLContext {
ExecDetails: &sc.SyncExecDetails,
}
})

// Check if the runaway checker is updated. This is to avoid that evaluating a non-correlated subquery
// during the optimization phase will cause the `*distsqlctx.DistSQLContext` to be created before the
// runaway checker is set later at the execution phase.
// Ref: https://github.com/pingcap/tidb/issues/61899
if dctx.RunawayChecker != sc.RunawayChecker {
dctx.RunawayChecker = sc.RunawayChecker
}

return dctx
}

// GetRangerCtx returns the context used in `ranger` related functions
Expand Down