add logic to throw exception on workload group deletion with associated rules by kaushalmahi12 · Pull Request #19502 · opensearch-project/OpenSearch

kaushalmahi12 · 2025-10-02T00:16:23Z

Description

Currently on workload group deletion, we do not delete the rules associated with that group. This change adds the logic to throw exception when there are rules associated with the workload group.

Related Issues

Resolves #19388

Check List

Functionality includes testing.
API changes companion pull request created, if applicable.
Public documentation issue/PR created, if applicable.

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.

github-actions · 2025-10-02T02:26:35Z

❌ Gradle check result for 26e9421: null

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?

jainankitk

I am wondering if we should rather throw exception and ask user to delete the associated rules first instead of deleting rules in the background?

kaushalmahi12 · 2025-10-02T17:48:17Z

@jainankitk I think since the objective is same, hence it makes sense to delete the rules as part of workload group deletion. Otherwise user will have to first identify the rules and then delete them vs us deleting them without any involvement from user.
In the end we should not keep any rules with a non-existing workload groups.

github-actions · 2025-10-02T18:50:46Z

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

github-actions · 2025-10-02T19:15:49Z

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

...ement/src/main/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupAction.java

github-actions · 2025-10-02T19:45:29Z

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

github-actions · 2025-10-02T21:49:21Z

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

jainankitk · 2025-10-02T22:33:16Z

@jainankitk I think since the objective is same, hence it makes sense to delete the rules as part of workload group deletion. Otherwise user will have to first identify the rules and then delete them vs us deleting them without any involvement from user. In the end we should not keep any rules with a non-existing workload groups.

IMO, if user created rule X, they should be the ones deleting rule X. We should avoid deleting rules in the background while deleting workload group. Instead, we should throw exception if rule X is still referring to a workload group that is being deleted.

While I doubt we will need something like this, but in future, if users really want this functionality, we can add --force to allow deleting the rules referring to the workload group being deleted. But for today, it is better for users to delete/update the rule themselves before deleting the workload group

github-actions · 2025-10-03T01:23:12Z

❌ Gradle check result for 8cf670c: 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: Kaushal Kumar <ravi.kaushal97@gmail.com>

github-actions · 2025-10-06T17:59:41Z

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

kaushalmahi12 · 2025-10-06T18:16:07Z

Looking into RestIT failures

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

github-actions · 2025-10-06T23:57:18Z

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

github-actions · 2025-10-07T03:03:07Z

❌ Gradle check result for 764bbb4: 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: Kaushal Kumar <ravi.kaushal97@gmail.com>

github-actions · 2025-10-07T21:14:22Z

✅ Gradle check result for 7a34c12: SUCCESS

codecov · 2025-10-07T21:14:47Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 73.04%. Comparing base (b553d3a) to head (701516e).
⚠️ Report is 6 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #19502      +/-   ##
============================================
+ Coverage     73.01%   73.04%   +0.03%     
  Complexity    70546    70546              
============================================
  Files          5719     5719              
  Lines        323251   323279      +28     
  Branches      46815    46817       +2     
============================================
+ Hits         236016   236147     +131     
+ Misses        68226    68113     -113     
- Partials      19009    19019      +10

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

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

github-actions · 2025-10-08T01:41:45Z

✅ Gradle check result for 701516e: SUCCESS

kaushalmahi12 · 2025-10-08T16:23:59Z

@jainankitk Can we merge this if you have reviewed ?

…ed rules (#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> (cherry picked from commit 2bb5e33) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…ed rules (#19502) (#19565) (cherry picked from commit 2bb5e33) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…ed rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com>

…ed rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Introduce Interceptor to Grpc Plugin - Signed-off-by: Aparajita Pandey <aparajita29pandey@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * This is a combination of 7 commits. Add testcases for gRPC Interceptor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Ran spotlessAppy Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> refactor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> spotlesssCheck Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> check if it verified Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain check if it verified Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> revert Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> empty commit Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> testCases Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> logger Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Resolve Conflict Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> javadoc Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * javadoc Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * cleanuo Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * move GrpcInterceptor Interface to spi Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * move GrpcInterceptor Interface to spi Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * build.gradle fixes Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * GrpcInterceptorChain refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * GrpcInterceptorChain refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * rebase Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * coverage Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * spotless Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Add logic to throw exception on workload group deletion with associated rules (#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * add documentation about debug-server-jvm in testing.md (#19567) Signed-off-by: Vigya Sharma <vigya.work@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Adds a mapper for context aware segments grouping criteria (#19233) * Adds Context aware grouping mapper The change also stores grouping criteria for each doc in parsed context Signed-off-by: Tejas Shah <shatejas@amazon.com> * Adds a test for ContextAwareGroupingScript Signed-off-by: Tejas Shah <shatejas@amazon.com> * Adds ContextAwareGroupingScript support in mockScriptEngine to fix integ tests Signed-off-by: Tejas Shah <shatejas@amazon.com> * Corrects CHANGELOG.md Signed-off-by: Tejas Shah <shatejas@amazon.com> * Fixes LangPainlessClientYamlTestSuiteIT Signed-off-by: Tejas Shah <shatejas@amazon.com> --------- Signed-off-by: Tejas Shah <shatejas@amazon.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Refactor README.md and GrpcInterceptorChain Constructor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * UpdateREADME & switch to implmentation Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Address PR review comments - Changed SPI dependencies from api to implementation - Made OrderedGrpcInterceptor a nested interface inside GrpcInterceptorProvider - Updated README with build.gradle extension declaration examples - Simplified duplicate order handling documentation Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * empty commit Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * resolve conflict Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> --------- Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: Vigya Sharma <vigya.work@gmail.com> Signed-off-by: Tejas Shah <shatejas@amazon.com> Signed-off-by: Aparajita Pandey <37636092+aparajita31pandey@users.noreply.github.com> Co-authored-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Co-authored-by: Vigya Sharma <vigyas@amazon.com> Co-authored-by: Tejas Shah <shatejas@amazon.com>

…ed rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

…ct#19005) * Introduce Interceptor to Grpc Plugin - Signed-off-by: Aparajita Pandey <aparajita29pandey@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * This is a combination of 7 commits. Add testcases for gRPC Interceptor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Ran spotlessAppy Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> refactor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> spotlesssCheck Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> check if it verified Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain check if it verified Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> revert Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> empty commit Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Added GrpcInterceptorChain Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> testCases Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> logger Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Resolve Conflict Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> javadoc Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * javadoc Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * cleanuo Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * move GrpcInterceptor Interface to spi Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * move GrpcInterceptor Interface to spi Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * build.gradle fixes Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * GrpcInterceptorChain refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * GrpcInterceptorChain refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * rebase Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * coverage Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * spotless Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Add logic to throw exception on workload group deletion with associated rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * add documentation about debug-server-jvm in testing.md (opensearch-project#19567) Signed-off-by: Vigya Sharma <vigya.work@gmail.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Adds a mapper for context aware segments grouping criteria (opensearch-project#19233) * Adds Context aware grouping mapper The change also stores grouping criteria for each doc in parsed context Signed-off-by: Tejas Shah <shatejas@amazon.com> * Adds a test for ContextAwareGroupingScript Signed-off-by: Tejas Shah <shatejas@amazon.com> * Adds ContextAwareGroupingScript support in mockScriptEngine to fix integ tests Signed-off-by: Tejas Shah <shatejas@amazon.com> * Corrects CHANGELOG.md Signed-off-by: Tejas Shah <shatejas@amazon.com> * Fixes LangPainlessClientYamlTestSuiteIT Signed-off-by: Tejas Shah <shatejas@amazon.com> --------- Signed-off-by: Tejas Shah <shatejas@amazon.com> Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Refactor README.md and GrpcInterceptorChain Constructor Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * UpdateREADME & switch to implmentation Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * refactoring Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * Address PR review comments - Changed SPI dependencies from api to implementation - Made OrderedGrpcInterceptor a nested interface inside GrpcInterceptorProvider - Updated README with build.gradle extension declaration examples - Simplified duplicate order handling documentation Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * empty commit Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> * resolve conflict Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> --------- Signed-off-by: Aparajita Pandey <aparajita31pandey@gmail.com> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Signed-off-by: Vigya Sharma <vigya.work@gmail.com> Signed-off-by: Tejas Shah <shatejas@amazon.com> Signed-off-by: Aparajita Pandey <37636092+aparajita31pandey@users.noreply.github.com> Co-authored-by: Kaushal Kumar <ravi.kaushal97@gmail.com> Co-authored-by: Vigya Sharma <vigyas@amazon.com> Co-authored-by: Tejas Shah <shatejas@amazon.com>

kaushalmahi12 requested a review from a team as a code owner October 2, 2025 00:16

github-actions bot added bug Something isn't working Search:Resiliency v3.3.0 labels Oct 2, 2025

kaushalmahi12 requested a review from ruai0511 October 2, 2025 00:20

kaushalmahi12 force-pushed the getwlm-api branch from 214d061 to 26e9421 Compare October 2, 2025 00:24

kkhatua requested a review from jainankitk October 2, 2025 04:08

jainankitk reviewed Oct 2, 2025

View reviewed changes

ruai0511 reviewed Oct 2, 2025

View reviewed changes

...ement/src/main/java/org/opensearch/plugin/wlm/action/TransportDeleteWorkloadGroupAction.java Outdated Show resolved Hide resolved

kaushalmahi12 added 8 commits October 6, 2025 09:52

add logic to delete rules on workload group deletion

38b1bcb

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

add CHANGELOG entry

0602c48

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

fix precommit errors

bed3a3a

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

fix the ut

553d88c

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

fix precommit

572dbbf

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

add logic to throw exception

9585e7b

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

change CHANGELOG

71b341c

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

fit IntegTests

9084f53

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

kaushalmahi12 force-pushed the getwlm-api branch from 8cf670c to 9084f53 Compare October 6, 2025 16:53

kaushalmahi12 changed the title ~~add logic to delete rules on workload group deletion~~ add logic to throw exception on workload group deletion with associated rules Oct 6, 2025

change the executor to remove deadlock

53ea8e2

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

change executor name in tests

bce9d6c

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

kaushalmahi12 force-pushed the getwlm-api branch from 764bbb4 to bce9d6c Compare October 7, 2025 18:45

Merge branch 'main' into getwlm-api

7a34c12

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

Merge branch 'main' into getwlm-api

701516e

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

jainankitk approved these changes Oct 8, 2025

View reviewed changes

jainankitk added the backport 3.3 Backport to 3.3 branch label Oct 8, 2025

jainankitk merged commit 2bb5e33 into opensearch-project:main Oct 8, 2025
37 checks passed

opensearch-trigger-bot bot mentioned this pull request Oct 8, 2025

[Backport 3.3] add logic to throw exception on workload group deletion with associated rules #19565

Merged

kaushalmahi12 deleted the getwlm-api branch October 8, 2025 19:57

opensearch-ci-bot mentioned this pull request Oct 9, 2025

[AUTOCUT] Gradle Check Flaky Test Report for IndexServiceTests #14407

Open

rgsriram pushed a commit to rgsriram/OpenSearch that referenced this pull request Oct 11, 2025

Add logic to throw exception on workload group deletion with associat…

5454322

…ed rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

BrewTestBot mentioned this pull request Oct 15, 2025

opensearch 3.3.0 Homebrew/homebrew-core#249627

Merged

peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Oct 15, 2025

Add logic to throw exception on workload group deletion with associat…

5c1d678

…ed rules (opensearch-project#19502) Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

tkykenmt mentioned this pull request Jan 11, 2026

[feature] Workload Management (WLM) tkykenmt/opensearch-feature-explorer#1321

Closed

3 tasks

Conversation

kaushalmahi12 commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

Check List

Uh oh!

github-actions bot commented Oct 2, 2025

Uh oh!

jainankitk left a comment

Choose a reason for hiding this comment

Uh oh!

kaushalmahi12 commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 2, 2025

Uh oh!

github-actions bot commented Oct 2, 2025

Uh oh!

Uh oh!

github-actions bot commented Oct 2, 2025

Uh oh!

github-actions bot commented Oct 2, 2025

Uh oh!

jainankitk commented Oct 2, 2025

Uh oh!

github-actions bot commented Oct 3, 2025

Uh oh!

github-actions bot commented Oct 6, 2025

Uh oh!

kaushalmahi12 commented Oct 6, 2025

Uh oh!

github-actions bot commented Oct 6, 2025

Uh oh!

github-actions bot commented Oct 7, 2025

Uh oh!

github-actions bot commented Oct 7, 2025

Uh oh!

codecov bot commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Oct 8, 2025

Uh oh!

kaushalmahi12 commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

kaushalmahi12 commented Oct 2, 2025 •

edited

Loading

kaushalmahi12 commented Oct 2, 2025 •

edited

Loading

codecov bot commented Oct 7, 2025 •

edited

Loading

kaushalmahi12 commented Oct 8, 2025 •

edited

Loading