Skip to content

[Backport 2.x] Add cancellation framework changes in wlm (#15651)#15905

Merged
jainankitk merged 1 commit intoopensearch-project:2.xfrom
kaushalmahi12:2.x
Sep 11, 2024
Merged

[Backport 2.x] Add cancellation framework changes in wlm (#15651)#15905
jainankitk merged 1 commit intoopensearch-project:2.xfrom
kaushalmahi12:2.x

Conversation

@kaushalmahi12
Copy link
Copy Markdown
Contributor

Backport 2.x for #15651

* cancellation related

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* add better cancellation reason

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update DefaultTaskCancellationTests.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* refactor

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* refactor

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update DefaultTaskCancellation.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update DefaultTaskCancellation.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update DefaultTaskCancellation.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* Update DefaultTaskSelectionStrategy.java

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* refactor

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* refactor node level threshold

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* use query group task

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* code clean up and refactorings

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add unit tests and fix existing ones

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* uncomment the test case

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* update CHANGELOG

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix imports

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* refactor and add UTs for new constructs

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix javadocs

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* remove code clutter

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* change annotation version and task selection strategy

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* rename a util class

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* remove wrappers from resource type

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* apply spotless

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add rename changes

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* refactor changes and logical bug fix

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
Signed-off-by: Ankit Jain <akjain@amazon.com>
Co-authored-by: Kiran Prakash <awskiran@amazon.com>
Co-authored-by: Ankit Jain <akjain@amazon.com>
@github-actions
Copy link
Copy Markdown
Contributor

❕ Gradle check result for cb40de8: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 11, 2024

Codecov Report

Attention: Patch coverage is 98.18182% with 2 lines in your changes missing coverage. Please review.

Project coverage is 71.56%. Comparing base (dc28eb2) to head (cb40de8).
Report is 2 commits behind head on 2.x.

Files with missing lines Patch % Lines
...ancellation/QueryGroupTaskCancellationService.java 96.87% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #15905      +/-   ##
============================================
+ Coverage     71.46%   71.56%   +0.09%     
- Complexity    64439    64495      +56     
============================================
  Files          5264     5269       +5     
  Lines        302012   302106      +94     
  Branches      43970    43979       +9     
============================================
+ Hits         215831   216189     +358     
+ Misses        68148    67849     -299     
- Partials      18033    18068      +35     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants