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

[Backport 2.x] Add wlm resiliency orchestrator (query group service) (#15925) #16225

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

kaushalmahi12
Copy link
Contributor

Backport 2.x for #15925

…ject#15925)

* 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>

* add queryGroupService

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>

* initial changes

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

* refactor changes and logical bug fix

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

* add chanegs

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

* address comments

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

* temp changes

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

* add UTs

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

* add changelog

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

* add task completion listener hook

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

* add remaining pieces to make the feature functional

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

* extend stats and fix bugs

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

* fix bugs and add logic to make SBP work with wlm

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

* address comments

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

* fix bugs and SBP ITs

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

* add missed applyCluster state change

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

* address comments

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

* decouple queryGroupService and cancellationService

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

* replace StateApplier with StateListener interface

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

* fix precommit errors

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>
Co-authored-by: Kiran Prakash <awskiran@amazon.com>
Copy link
Contributor

github-actions bot commented Oct 8, 2024

✅ Gradle check result for b74cc5c: SUCCESS

Copy link

codecov bot commented Oct 8, 2024

Codecov Report

Attention: Patch coverage is 88.38174% with 28 lines in your changes missing coverage. Please review.

Project coverage is 71.70%. Comparing base (704e498) to head (b74cc5c).
Report is 1 commits behind head on 2.x.

Files with missing lines Patch % Lines
...ain/java/org/opensearch/wlm/QueryGroupService.java 86.95% 6 Missing and 9 partials ⚠️
...org/opensearch/wlm/WorkloadManagementSettings.java 71.42% 6 Missing ⚠️
...ancellation/QueryGroupTaskCancellationService.java 92.30% 2 Missing and 2 partials ⚠️
...rver/src/main/java/org/opensearch/wlm/WlmMode.java 83.33% 1 Missing and 1 partial ⚠️
...c/main/java/org/opensearch/wlm/QueryGroupTask.java 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #16225      +/-   ##
============================================
- Coverage     71.72%   71.70%   -0.02%     
- Complexity    64773    64891     +118     
============================================
  Files          5284     5286       +2     
  Lines        303053   303262     +209     
  Branches      44086    44108      +22     
============================================
+ Hits         217372   217465      +93     
- Misses        67457    67709     +252     
+ Partials      18224    18088     -136     

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

@jainankitk jainankitk merged commit 3b4e11d into opensearch-project:2.x Oct 8, 2024
58 checks passed
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