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

distsql: do not merge unconsumed CopStats if not belong to user sessions #51950

Merged
merged 5 commits into from
Mar 26, 2024
Merged

distsql: do not merge unconsumed CopStats if not belong to user sessions #51950

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ac19ac
not merge unconsumed CopStats if not user session
jiyfhust Mar 20, 2024
595b336
fix
jiyfhust Mar 20, 2024
d1596e4
Revert "fix"
jiyfhust Mar 20, 2024
8e0d4cc
fix
jiyfhust Mar 21, 2024
2082420
Merge branch 'pingcap:master' into fix_runtime_merge_unconsumed
jiyfhust Mar 26, 2024
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
14 changes: 8 additions & 6 deletions pkg/distsql/select_result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,14 +603,16 @@ func (r *selectResult) Close() error {
if respSize > 0 {
r.memConsume(-respSize)
}
if unconsumed, ok := r.resp.(copr.HasUnconsumedCopRuntimeStats); ok && unconsumed != nil {
unconsumedCopStats := unconsumed.CollectUnconsumedCopRuntimeStats()
for _, copStats := range unconsumedCopStats {
_ = r.updateCopRuntimeStats(context.Background(), copStats, time.Duration(0))
r.ctx.GetSessionVars().StmtCtx.MergeExecDetails(&copStats.ExecDetails, nil)
if r.ctx != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If r.ctx == nil, L624 also panics.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May there is some relationship between r.stats != nil and r.ctx != nil, because L624 is not new introduced and not sure if it ever paniced before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add judgement r.ctx != nil to check it by 8e0d4cc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, both ctx and stats are not set for check sum requests.

if unconsumed, ok := r.resp.(copr.HasUnconsumedCopRuntimeStats); ok && unconsumed != nil {
unconsumedCopStats := unconsumed.CollectUnconsumedCopRuntimeStats()
for _, copStats := range unconsumedCopStats {
_ = r.updateCopRuntimeStats(context.Background(), copStats, time.Duration(0))
r.ctx.GetSessionVars().StmtCtx.MergeExecDetails(&copStats.ExecDetails, nil)
}
}
}
if r.stats != nil {
if r.stats != nil && r.ctx != nil {
defer func() {
if ci, ok := r.resp.(copr.CopInfo); ok {
r.stats.buildTaskDuration = ci.GetBuildTaskElapsed()
Expand Down