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

QueryGroup Resource Tracking framework and implementation #13897

Merged
merged 67 commits into from
Aug 7, 2024

Conversation

kiranprakash154
Copy link
Contributor

@kiranprakash154 kiranprakash154 commented May 30, 2024

Description

QueryGroupResourceUsageTrackerService - the main tracker class that builds resource usage views at the QueryGroup level.

Below is the test coverage report
image

Related Issues

#12342

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • API changes companion pull request created.
  • 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.

@kiranprakash154 kiranprakash154 changed the title initial code for the sandbox resource tracking and cancellation frame… [QSB] Initial code for the sandbox resource tracking and cancellation frame… May 30, 2024
@kiranprakash154 kiranprakash154 changed the title [QSB] Initial code for the sandbox resource tracking and cancellation frame… [QSB] Initial code for the sandbox resource tracking and cancellation framework May 30, 2024
@kiranprakash154 kiranprakash154 self-assigned this May 30, 2024
Copy link
Contributor

❌ Gradle check result for 225c31a: 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

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

❌ Gradle check result for 6ff29bf: 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

❌ Gradle check result for 44b30f4: 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

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

❌ Gradle check result for 68570d8: 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

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

❌ Gradle check result for 97a0986: 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

❌ Gradle check result for 2b542a6: 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

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

❌ Gradle check result for 6e03383: 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

❌ Gradle check result for 57b1a37: 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

✅ Gradle check result for 5e17561: SUCCESS

Copy link

codecov bot commented May 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.86%. Comparing base (a918530) to head (36b559c).

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13897      +/-   ##
============================================
+ Coverage     71.84%   71.86%   +0.01%     
- Complexity    62911    62974      +63     
============================================
  Files          5176     5178       +2     
  Lines        295133   295167      +34     
  Branches      42676    42679       +3     
============================================
+ Hits         212029   212112      +83     
+ Misses        65709    65658      -51     
- Partials      17395    17397       +2     

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

Copy link
Contributor

github-actions bot commented Jun 4, 2024

❌ Gradle check result for 07e4a51: 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 Jun 4, 2024

❌ Gradle check result for 98989ba: 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 Jun 4, 2024

❕ Gradle check result for 8aeea17: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.gateway.RecoveryFromGatewayIT.testShardStoreFetchMultiNodeMultiIndexesUsingBatchAction

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

Copy link
Contributor

github-actions bot commented Jun 5, 2024

❌ Gradle check result for 99a76dd: 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 Jun 5, 2024

❌ Gradle check result for 8ce19f9: 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 3, 2024

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

@jed326
Copy link
Collaborator

jed326 commented Aug 7, 2024

In this specific case it's because I didn't catch that an item for an earlier PR went into the wrong changelog file, fixing that in #15150

@jed326 jed326 added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Aug 7, 2024
@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-13897-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 97c1bf01ff511c4db74dc8a81045447b009bec29
# Push it to GitHub
git push --set-upstream origin backport/backport-13897-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-13897-to-2.x.

kiranprakash154 added a commit to kiranprakash154/OpenSearch that referenced this pull request Aug 7, 2024
…-project#13897)

* initial code for the sandbox resource tracking and cancellation framework

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

* Fix Failing Tests

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

* spotless Apply

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

* Update SandboxService.java

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

* Update SandboxService.java

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

* Update SandboxTask.java

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

* Add java docs

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

* spotless

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

* javadocs

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

* javadocs

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

* java docs

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

* Update AbstractTaskCancellation.java

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

* Update SandboxModule.java

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

* Some tests and stubs

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

* spotless

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

* :server:testingConventions

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

* Update AbstractTaskCancellation.java

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

* more tests

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

* addressing comments

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

* revert some accidentally pushed files

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

* resolve flakiness

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

* renaming sandbox to querygroup and adjusting code based on merged PRs

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

* jvm to memory

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

* missing java docs

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

* spotless

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* pluck cancellation changes out of this PR

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

* remove unused

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

* remove cancellation related code and add more tests coverage

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

* us only memory and not jvm

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

* test conventions

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

* Bring back enum

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

* Update SearchBackpressureService.java

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

* revert changes

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

* revert changes

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

* all required changes

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

* Update CHANGELOG.md

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

* cleanups

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

* Delete QueryGroupService.java

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

* cleanups

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* rebasing with latest main

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

* remove experimental

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

* remove queryGroupId

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

* Update QueryGroupResourceUsageTrackerService.java

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

* change code comments

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

* remmove QueryGroupUsageTracker

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* remove QueryGroupTestHelpers

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

* cleanups

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

* remove queryGroupHelper

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

* Update ResourceTypeTests.java

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

* extend OpenSearchTestCase

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

* pr comments

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

* Update CHANGELOG.md

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

* Update QueryGroupResourceUsageTrackerServiceTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceType.java

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

* Update ResourceType.java

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

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
(cherry picked from commit 97c1bf0)
jed326 pushed a commit that referenced this pull request Aug 8, 2024
…15154)

* initial code for the sandbox resource tracking and cancellation framework

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

* Fix Failing Tests

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

* spotless Apply

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

* Update SandboxService.java

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

* Update SandboxService.java

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

* Update SandboxTask.java

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

* Add java docs

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

* spotless

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

* javadocs

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

* javadocs

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

* java docs

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

* Update AbstractTaskCancellation.java

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

* Update SandboxModule.java

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

* Some tests and stubs

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

* spotless

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

* :server:testingConventions

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

* Update AbstractTaskCancellation.java

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

* more tests

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

* addressing comments

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

* revert some accidentally pushed files

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

* resolve flakiness

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

* renaming sandbox to querygroup and adjusting code based on merged PRs

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

* jvm to memory

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

* missing java docs

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

* spotless

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* pluck cancellation changes out of this PR

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

* remove unused

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

* remove cancellation related code and add more tests coverage

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

* us only memory and not jvm

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

* test conventions

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

* Bring back enum

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

* Update SearchBackpressureService.java

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

* revert changes

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

* revert changes

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

* all required changes

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

* Update CHANGELOG.md

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

* cleanups

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

* Delete QueryGroupService.java

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

* cleanups

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* rebasing with latest main

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

* remove experimental

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

* remove queryGroupId

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

* Update QueryGroupResourceUsageTrackerService.java

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

* change code comments

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

* remmove QueryGroupUsageTracker

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* remove QueryGroupTestHelpers

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

* cleanups

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

* remove queryGroupHelper

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

* Update ResourceTypeTests.java

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

* extend OpenSearchTestCase

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

* pr comments

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

* Update CHANGELOG.md

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

* Update QueryGroupResourceUsageTrackerServiceTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceType.java

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

* Update ResourceType.java

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

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
(cherry picked from commit 97c1bf0)
harshavamsi pushed a commit to harshavamsi/OpenSearch that referenced this pull request Aug 20, 2024
…-project#13897)

* initial code for the sandbox resource tracking and cancellation framework

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

* Fix Failing Tests

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

* spotless Apply

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

* Update SandboxService.java

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

* Update SandboxService.java

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

* Update SandboxTask.java

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

* Add java docs

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

* spotless

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

* javadocs

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

* javadocs

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

* java docs

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

* Update AbstractTaskCancellation.java

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

* Update SandboxModule.java

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

* Some tests and stubs

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

* spotless

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

* :server:testingConventions

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

* Update AbstractTaskCancellation.java

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

* more tests

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

* addressing comments

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

* revert some accidentally pushed files

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

* resolve flakiness

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

* renaming sandbox to querygroup and adjusting code based on merged PRs

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

* jvm to memory

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

* missing java docs

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

* spotless

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* pluck cancellation changes out of this PR

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

* remove unused

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

* remove cancellation related code and add more tests coverage

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

* us only memory and not jvm

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

* test conventions

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

* Bring back enum

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

* Update SearchBackpressureService.java

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

* revert changes

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

* revert changes

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

* all required changes

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

* Update CHANGELOG.md

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

* cleanups

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

* Delete QueryGroupService.java

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

* cleanups

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* rebasing with latest main

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

* remove experimental

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

* remove queryGroupId

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

* Update QueryGroupResourceUsageTrackerService.java

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

* change code comments

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

* remmove QueryGroupUsageTracker

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* remove QueryGroupTestHelpers

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

* cleanups

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

* remove queryGroupHelper

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

* Update ResourceTypeTests.java

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

* extend OpenSearchTestCase

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

* pr comments

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

* Update CHANGELOG.md

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

* Update QueryGroupResourceUsageTrackerServiceTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceType.java

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

* Update ResourceType.java

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

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
…-project#13897)

* initial code for the sandbox resource tracking and cancellation framework

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

* Fix Failing Tests

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

* spotless Apply

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

* Update SandboxService.java

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

* Update SandboxService.java

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

* Update SandboxTask.java

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

* Add java docs

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

* spotless

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

* javadocs

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

* javadocs

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

* java docs

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

* Update AbstractTaskCancellation.java

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

* Update SandboxModule.java

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

* Some tests and stubs

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

* spotless

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

* :server:testingConventions

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

* Update AbstractTaskCancellation.java

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

* more tests

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

* addressing comments

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

* revert some accidentally pushed files

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

* resolve flakiness

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

* renaming sandbox to querygroup and adjusting code based on merged PRs

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

* jvm to memory

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

* missing java docs

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

* spotless

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* pluck cancellation changes out of this PR

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

* remove unused

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

* remove cancellation related code and add more tests coverage

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

* us only memory and not jvm

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

* test conventions

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

* Bring back enum

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

* Update SearchBackpressureService.java

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

* revert changes

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

* revert changes

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

* all required changes

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

* Update CHANGELOG.md

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

* cleanups

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

* Delete QueryGroupService.java

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

* cleanups

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* rebasing with latest main

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

* remove experimental

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

* remove queryGroupId

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

* Update QueryGroupResourceUsageTrackerService.java

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

* change code comments

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

* remmove QueryGroupUsageTracker

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* remove QueryGroupTestHelpers

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

* cleanups

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

* remove queryGroupHelper

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

* Update ResourceTypeTests.java

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

* extend OpenSearchTestCase

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

* pr comments

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

* Update CHANGELOG.md

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

* Update QueryGroupResourceUsageTrackerServiceTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceType.java

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

* Update ResourceType.java

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

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
…-project#13897)

* initial code for the sandbox resource tracking and cancellation framework

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

* Fix Failing Tests

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

* spotless Apply

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

* Update SandboxService.java

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

* Update SandboxService.java

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

* Update SandboxTask.java

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

* Add java docs

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

* spotless

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

* javadocs

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

* javadocs

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

* java docs

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

* Update AbstractTaskCancellation.java

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

* Update SandboxModule.java

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

* Some tests and stubs

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

* spotless

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

* :server:testingConventions

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

* Update AbstractTaskCancellation.java

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

* more tests

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

* addressing comments

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

* revert some accidentally pushed files

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

* resolve flakiness

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

* renaming sandbox to querygroup and adjusting code based on merged PRs

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

* jvm to memory

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

* missing java docs

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

* spotless

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* pluck cancellation changes out of this PR

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

* remove unused

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

* remove cancellation related code and add more tests coverage

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

* us only memory and not jvm

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

* test conventions

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

* Bring back enum

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

* Update SearchBackpressureService.java

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

* revert changes

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

* revert changes

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

* all required changes

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

* Update CHANGELOG.md

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

* cleanups

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

* Delete QueryGroupService.java

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

* cleanups

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupLevelResourceUsageViewTests.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update CHANGELOG.md
Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* rebasing with latest main

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

* remove experimental

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

* remove queryGroupId

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

* Update QueryGroupResourceUsageTrackerService.java

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

* change code comments

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

* remmove QueryGroupUsageTracker

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

* Update QueryGroupResourceUsageTrackerService.java

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

* Update QueryGroupResourceUsageTrackerService.java

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

* remove QueryGroupTestHelpers

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

* cleanups

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

* remove queryGroupHelper

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

* Update ResourceTypeTests.java

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

* extend OpenSearchTestCase

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

* pr comments

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

* Update CHANGELOG.md

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

* Update QueryGroupResourceUsageTrackerServiceTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceTypeTests.java

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

* Update ResourceType.java

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

* Update ResourceType.java

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

---------

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants