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

Add Create QueryGroup API Logic #14680

Merged
merged 20 commits into from
Aug 13, 2024
Merged

Conversation

ruai0511
Copy link
Contributor

@ruai0511 ruai0511 commented Jul 9, 2024

Description

This change introduces the Create QueryGroup API which we will use to enforce node level resiliency as part of this RFC: #12342. The draft PR opened for the API specs is: opensearch-project/opensearch-api-specification#356

The Create QueryGroup API schema is:

curl -XPUT "localhost:9200/_wlm/query_group/" -H 'Content-Type: application/json' -d ' 
{
    "name": "analytics",
    "resiliency_mode": "enforced",
    "resource_limits": {
        "cpu" : 0.4,
        "memory" : 0.2
    }
}'

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

@ruai0511 ruai0511 changed the title Adding Create QueryGroup API Add Create QueryGroup API Logic Jul 9, 2024
@ruai0511 ruai0511 added the backport 2.x Backport to 2.x branch label Jul 9, 2024
Copy link
Contributor

github-actions bot commented Jul 9, 2024

❌ Gradle check result for d849280: 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?

Copy link
Contributor

github-actions bot commented Jul 9, 2024

❌ Gradle check result for 5e9db9f: 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?

Copy link
Contributor

github-actions bot commented Jul 9, 2024

❌ Gradle check result for daa8c22: 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?

Copy link
Contributor

github-actions bot commented Jul 9, 2024

❌ Gradle check result for ef8945b: 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?

Signed-off-by: Ruirui Zhang <[email protected]>
Copy link
Contributor

✅ Gradle check result for 8e35c7c: SUCCESS

Copy link
Contributor

✅ Gradle check result for 8e123f7: SUCCESS

@mch2 mch2 merged commit d442f7c into opensearch-project:main Aug 13, 2024
34 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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-14680-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d442f7c1684af2c58e3de8c9b054c65072a03bea
# Push it to GitHub
git push --set-upstream origin backport/backport-14680-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-14680-to-2.x.

jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Aug 13, 2024
* add logic for Create QueryGroup API
Signed-off-by: Ruirui Zhang <[email protected]>

* remove wildcard imports
Signed-off-by: Ruirui Zhang <[email protected]>

* change jvm to memeory
Signed-off-by: Ruirui Zhang <[email protected]>

* modify querygroup
Signed-off-by: Ruirui Zhang <[email protected]>

* fix javadoc and add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix the persist logic
Signed-off-by: Ruirui Zhang <[email protected]>

* remove inflight checks as they are not necessary
Signed-off-by: Ruirui Zhang <[email protected]>

* remove persistable interface
Signed-off-by: Ruirui Zhang <[email protected]>

* modify QueryGroupServiceSettings
Signed-off-by: Ruirui Zhang <[email protected]>

* add in an action package in the plugin
Signed-off-by: Ruirui Zhang <[email protected]>

* modify based on commments
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on QueryGroupPersistenceService
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on persistence service
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix unit test
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* add IT
Signed-off-by: Ruirui Zhang <[email protected]>

* add coverage
Signed-off-by: Ruirui Zhang <[email protected]>
(cherry picked from commit d442f7c)
@jainankitk
Copy link
Collaborator

jainankitk commented Aug 13, 2024

@ruai0511 - I was curious what conflicting changes are failing the backport. Turns out the views method is not present in 2.x, hence Metadata class was conflicting. That makes sense as Views were never backported to 2.x. Hence, raised the backport PR

@jainankitk jainankitk mentioned this pull request Aug 13, 2024
8 tasks
jed326 pushed a commit that referenced this pull request Aug 16, 2024
* add logic for Create QueryGroup API
Signed-off-by: Ruirui Zhang <[email protected]>

* remove wildcard imports
Signed-off-by: Ruirui Zhang <[email protected]>

* change jvm to memeory
Signed-off-by: Ruirui Zhang <[email protected]>

* modify querygroup
Signed-off-by: Ruirui Zhang <[email protected]>

* fix javadoc and add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix the persist logic
Signed-off-by: Ruirui Zhang <[email protected]>

* remove inflight checks as they are not necessary
Signed-off-by: Ruirui Zhang <[email protected]>

* remove persistable interface
Signed-off-by: Ruirui Zhang <[email protected]>

* modify QueryGroupServiceSettings
Signed-off-by: Ruirui Zhang <[email protected]>

* add in an action package in the plugin
Signed-off-by: Ruirui Zhang <[email protected]>

* modify based on commments
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on QueryGroupPersistenceService
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on persistence service
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix unit test
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* add IT
Signed-off-by: Ruirui Zhang <[email protected]>

* add coverage
Signed-off-by: Ruirui Zhang <[email protected]>
(cherry picked from commit d442f7c)

Co-authored-by: Ruirui Zhang <[email protected]>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
* add logic for Create QueryGroup API
Signed-off-by: Ruirui Zhang <[email protected]>

* remove wildcard imports
Signed-off-by: Ruirui Zhang <[email protected]>

* change jvm to memeory
Signed-off-by: Ruirui Zhang <[email protected]>

* modify querygroup
Signed-off-by: Ruirui Zhang <[email protected]>

* fix javadoc and add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix the persist logic
Signed-off-by: Ruirui Zhang <[email protected]>

* remove inflight checks as they are not necessary
Signed-off-by: Ruirui Zhang <[email protected]>

* remove persistable interface
Signed-off-by: Ruirui Zhang <[email protected]>

* modify QueryGroupServiceSettings
Signed-off-by: Ruirui Zhang <[email protected]>

* add in an action package in the plugin
Signed-off-by: Ruirui Zhang <[email protected]>

* modify based on commments
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on QueryGroupPersistenceService
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on persistence service
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix unit test
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* add IT
Signed-off-by: Ruirui Zhang <[email protected]>

* add coverage
Signed-off-by: Ruirui Zhang <[email protected]>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
* add logic for Create QueryGroup API
Signed-off-by: Ruirui Zhang <[email protected]>

* remove wildcard imports
Signed-off-by: Ruirui Zhang <[email protected]>

* change jvm to memeory
Signed-off-by: Ruirui Zhang <[email protected]>

* modify querygroup
Signed-off-by: Ruirui Zhang <[email protected]>

* fix javadoc and add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* add more tests
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix the persist logic
Signed-off-by: Ruirui Zhang <[email protected]>

* remove inflight checks as they are not necessary
Signed-off-by: Ruirui Zhang <[email protected]>

* remove persistable interface
Signed-off-by: Ruirui Zhang <[email protected]>

* modify QueryGroupServiceSettings
Signed-off-by: Ruirui Zhang <[email protected]>

* add in an action package in the plugin
Signed-off-by: Ruirui Zhang <[email protected]>

* modify based on commments
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on QueryGroupPersistenceService
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments on persistence service
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* fix unit test
Signed-off-by: Ruirui Zhang <[email protected]>

* address comments
Signed-off-by: Ruirui Zhang <[email protected]>

* add IT
Signed-off-by: Ruirui Zhang <[email protected]>

* add coverage
Signed-off-by: Ruirui Zhang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants