Add tracking for long running SearchTask post cancellation#17726
Merged
jainankitk merged 2 commits intoopensearch-project:mainfrom Apr 5, 2025
Merged
Add tracking for long running SearchTask post cancellation#17726jainankitk merged 2 commits intoopensearch-project:mainfrom
jainankitk merged 2 commits intoopensearch-project:mainfrom
Conversation
d739404 to
ea4d4da
Compare
Contributor
|
❌ Gradle check result for ea4d4da: Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
sgup432
reviewed
Mar 31, 2025
server/src/main/java/org/opensearch/tasks/TaskCancellationStats.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/tasks/TaskCancellationStats.java
Outdated
Show resolved
Hide resolved
ea4d4da to
c940580
Compare
Contributor
|
❌ Gradle check result for c940580: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
sgup432
approved these changes
Apr 4, 2025
Signed-off-by: Ruirui Zhang <mariazrr@amazon.com>
Signed-off-by: Ruirui Zhang <mariazrr@amazon.com>
c940580 to
5d0ecd3
Compare
Contributor
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #17726 +/- ##
=========================================
Coverage 72.32% 72.32%
+ Complexity 66005 65969 -36
=========================================
Files 5356 5360 +4
Lines 306446 306504 +58
Branches 44395 44405 +10
=========================================
+ Hits 221634 221685 +51
- Misses 66660 66671 +11
+ Partials 18152 18148 -4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
jainankitk
approved these changes
Apr 5, 2025
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-17726-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e9d8e0007b58f96a89b1a400a14eb2ed9f7aa597
# Push it to GitHub
git push --set-upstream origin backport/backport-17726-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.xThen, create a pull request where the |
This was referenced Apr 14, 2025
ruai0511
added a commit
to ruai0511/OpenSearch
that referenced
this pull request
Apr 22, 2025
…h-project#17726) Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add tracking for long running SearchTask post cancellation Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add version checks for searchTask Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> (cherry picked from commit e9d8e00)
3 tasks
This was referenced Jan 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR addes tracking logic for SearchTask to monitor rogue queries at the coordinator level. Previously, the service only tracked SearchShardTask (queries at the shard level) that were cancelled but continued running.
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
#17719
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.