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

Jump to bottom

[BugFix] fix query timeout behavior when using query queue #53677

Merged
merged 2 commits into from
Dec 9, 2024
Merged

[BugFix] fix query timeout behavior when using query queue #53677

merged 2 commits into from
Dec 9, 2024

Conversation

murphyatwork
Copy link
Contributor

@murphyatwork murphyatwork commented Dec 6, 2024 •
edited
Loading

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:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.4
    • 3.3
    • 3.2
    • 3.1
    • 3.0

@murphyatwork murphyatwork requested a review from a team as a code owner December 6, 2024 08:30
@murphyatwork murphyatwork force-pushed the murphy_fi_query_timeout branch from a08aaf7 to 3e085fc Compare December 6, 2024 08:31
@murphyatwork murphyatwork changed the title [BugFix] fix query_timeout when using query queue [BugFix] fix query timeout behavior when using query queue Dec 6, 2024
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Dec 9, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

[Java-Extensions Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

[FE Incremental Coverage Report]

✅ pass : 11 / 11 (100.00%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/qe/QueryQueueManager.java 7 7 100.00% []
🔵 com/starrocks/qe/scheduler/slot/LogicalSlot.java 1 1 100.00% []
🔵 com/starrocks/qe/ConnectContext.java 3 3 100.00% []

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

[BE Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

@stdpain stdpain merged commit 880022b into StarRocks:main Dec 9, 2024
66 of 69 checks passed
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

@Mergifyio backport branch-3.4

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

@Mergifyio backport branch-3.3

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

@Mergifyio backport branch-3.2

@github-actions github-actions bot removed the 3.2 label Dec 9, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 9, 2024 •
edited
Loading

backport branch-3.4

✅ Backports have been created

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 9, 2024 •
edited
Loading

backport branch-3.3

✅ Backports have been created

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 9, 2024 •
edited
Loading

backport branch-3.2

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 9, 2024
@murphyatwork @mergify
[BugFix] fix query timeout behavior when using query queue (#53677)
9866e61 
Signed-off-by: Murphy <[email protected]>
(cherry picked from commit 880022b)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java
@mergify mergify bot mentioned this pull request Dec 9, 2024
Merged
42 tasks
mergify bot pushed a commit that referenced this pull request Dec 9, 2024
@murphyatwork @mergify
[BugFix] fix query timeout behavior when using query queue (#53677)
9b15c2e 
Signed-off-by: Murphy <[email protected]>
(cherry picked from commit 880022b)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java
mergify bot pushed a commit that referenced this pull request Dec 9, 2024
@murphyatwork @mergify
[BugFix] fix query timeout behavior when using query queue (#53677)
64ee54d 
Signed-off-by: Murphy <[email protected]>
(cherry picked from commit 880022b)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java
@mergify mergify bot mentioned this pull request Dec 9, 2024
Merged
42 tasks
@mergify mergify bot mentioned this pull request Dec 9, 2024
Merged
42 tasks
murphyatwork added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
a5cfc25 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
970d865 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
ff8bf1f 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
6572dc4 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
84343c2 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
b544f0b 
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 added a commit that referenced this pull request Dec 10, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
b1cce86 
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 added a commit that referenced this pull request Dec 11, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
848ad3e 
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 added a commit that referenced this pull request Dec 11, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
29666bd 
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 added a commit that referenced this pull request Dec 11, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
533dab1 
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
wanpengfei-git pushed a commit that referenced this pull request Dec 11, 2024
@mergify @murphyatwork
[BugFix] fix query timeout behavior when using query queue (backport #…
d808a56 
…53677) (#53726)

Co-authored-by: Murphy <[email protected]>
murphyatwork added a commit that referenced this pull request Dec 11, 2024
@murphyatwork
[BugFix] fix query timeout behavior when using query queue (#53677)
6512bd4 
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
wanpengfei-git pushed a commit that referenced this pull request Dec 11, 2024
@mergify @murphyatwork
[BugFix] fix query timeout behavior when using query queue (backport #…
136ab3d 
…53677) (#53727)

Co-authored-by: Murphy <[email protected]>
wanpengfei-git pushed a commit that referenced this pull request Dec 23, 2024
@mergify @murphyatwork
[BugFix] fix query timeout behavior when using query queue (backport #…
3a54857 
…53677) (#53728)

Co-authored-by: Murphy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stdpain stdpain stdpain approved these changes

@ZiheLiu ZiheLiu ZiheLiu approved these changes

Assignees

@murphyatwork murphyatwork

Labels
3.2-merged 3.3-merged 3.4-merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@murphyatwork @ZiheLiu @stdpain