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.

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

[BugFix] fix query timeout behavior when using query queue (backport #53677) #53726

Merged
merged 1 commit into from
Dec 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 9, 2024

Why I'm doing:

For a particular case that a query takes hundreds of seconds in the optimizer then pend in the query queue:

  1. The real timeout can be longer than expected, because query queue pending timeout count from creating slot, but not from command start
  2. The counter query_queue_timeout is not changed, since that pending request received a cancel request

What I'm doing:

  1. Query queue pending deadline should count from command start, instead of the time when create slot
  2. The pending can be cancelled by other thread, so it also need to deal with the CancellationException

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

Why I'm doing:

For a particular case that a query takes hundreds of seconds in the optimizer then pend in the query queue:

  1. The real timeout can be longer than expected, because query queue pending timeout count from creating slot, but not from command start
  2. The counter query_queue_timeout is not changed, since that pending request received a cancel request

What I'm doing:

  1. Query queue pending deadline should count from command start, instead of the time when create slot
  2. The pending can be cancelled by other thread, so it also need to deal with the CancellationException

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

@mergify mergify bot added the conflicts label Dec 9, 2024
Copy link
Contributor Author

mergify bot commented Dec 9, 2024

Cherry-pick of 880022b has failed:

On branch mergify/bp/branch-3.4/pr-53677
Your branch is up to date with 'origin/branch-3.4'.

You are currently cherry-picking commit 880022b3dc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/scheduler/slot/LogicalSlot.java
	modified:   fe/fe-core/src/test/java/com/starrocks/qe/scheduler/QueryQueueManagerTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 9, 2024 12:23
@mergify mergify bot closed this Dec 9, 2024
auto-merge was automatically disabled December 9, 2024 12:23

Pull request was closed

Copy link
Contributor Author

mergify bot commented Dec 9, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@murphyatwork murphyatwork reopened this Dec 10, 2024
@murphyatwork murphyatwork force-pushed the mergify/bp/branch-3.4/pr-53677 branch from 9866e61 to a5cfc25 Compare December 10, 2024 03:44
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 10, 2024 03:45
@murphyatwork murphyatwork force-pushed the mergify/bp/branch-3.4/pr-53677 branch from a5cfc25 to b1cce86 Compare December 10, 2024 07:33
Signed-off-by: Murphy <[email protected]>
(cherry picked from commit 880022b)
Signed-off-by: Murphy <[email protected]>

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java
@murphyatwork murphyatwork force-pushed the mergify/bp/branch-3.4/pr-53677 branch from b1cce86 to 848ad3e Compare December 11, 2024 07:10
@wanpengfei-git wanpengfei-git merged commit d808a56 into branch-3.4 Dec 11, 2024
29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.4/pr-53677 branch December 11, 2024 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants