Remove redundant field from GetDecommissionStateResponse #4751

imRishN · 2022-10-12T17:23:33Z

Signed-off-by: Rishab Nahata rnnahata@amazon.com

Description

This PR tries to remove the redundant field from GET api to retrieve decommission state

Before the fix -

curl -X GET "localhost:9202/_cluster/decommission/awareness/_status?pretty"

{
	"awareness" : {
		"zone" : "zone-1"
	},
	"status" : "SUCCESSFUL"
}

After the fix -

~                                                                                                                                                                                                                  03:23:31
> curl -X GET "localhost:9200/_cluster/decommission/awareness/zone/_status?pretty"
{ }

~                                                                                                                                                                                                                  03:23:36
> curl -X PUT "localhost:9201/_cluster/decommission/awareness/zone/zone-2?pretty"
{
  "acknowledged" : true
}

~                                                                                                                                                                                                                  03:23:58
> curl -X GET "localhost:9200/_cluster/decommission/awareness/zone/_status?pretty"
{
  "zone-2" : "SUCCESSFUL"
}

~                                                                                                                                                                                                                  03:24:03
> curl -X GET "localhost:9200/_cluster/decommission/awareness/random/_status?pretty"
{ }

~                                                                                                                                                                                                                  03:24:11
> curl -X GET "localhost:9202/_cluster/decommission/awareness/random/_status?pretty"
{ }

~                                                                                                                                                                                                                  03:24:18
> curl -X GET "localhost:9202/_cluster/decommission/awareness/zone/_status?pretty"
{
  "zone-2" : "SUCCESSFUL"
}

~                                                                                                                                                                                                                  03:24:24
> curl -X GET "localhost:9202/_cluster/decommission/awareness/_status?pretty"
{
  "error" : "no handler found for uri [/_cluster/decommission/awareness/_status] and method [GET]"
}

Issues Resolved

#4750

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff
Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

github-actions · 2022-10-12T17:53:24Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/4501/
CommitID: abefb7a

github-actions · 2022-10-12T18:02:29Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/4502/
CommitID: 14628fa

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

…i-fix

github-actions · 2022-10-13T13:02:35Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/4573/
CommitID: 8caa328

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

github-actions · 2022-10-13T14:27:40Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/4584/
CommitID: 77a2567

sachinpkale · 2022-10-14T05:05:55Z

Overall changes look good. Can you please update the PR description with API response before and after the change?

Also, the build is failing. Please fix.

…i-fix Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

github-actions · 2022-10-14T06:25:59Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/4686/
CommitID: a430ba2

codecov-commenter · 2022-10-14T06:30:14Z

Codecov Report

Merging #4751 (89b107b) into main (5d7d83e) will increase coverage by 0.21%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##               main    #4751      +/-   ##
============================================
+ Coverage     70.60%   70.82%   +0.21%     
- Complexity    57603    57734     +131     
============================================
  Files          4675     4675              
  Lines        276925   276916       -9     
  Branches      40347    40340       -7     
============================================
+ Hits         195517   196114     +597     
+ Misses        65156    64548     -608     
- Partials      16252    16254       +2

Impacted Files	Coverage Δ
...reness/get/GetDecommissionStateRequestBuilder.java	`0.00% <0.00%> (ø)`
...eness/get/TransportGetDecommissionStateAction.java	`23.07% <0.00%> (-1.93%)`	⬇️
.../org/opensearch/client/support/AbstractClient.java	`32.54% <ø> (+0.23%)`	⬆️
.../admin/cluster/RestGetDecommissionStateAction.java	`42.85% <25.00%> (-17.15%)`	⬇️
...on/awareness/get/GetDecommissionStateResponse.java	`42.85% <47.36%> (-1.92%)`	⬇️
...ion/awareness/get/GetDecommissionStateRequest.java	`82.35% <83.33%> (+82.35%)`	⬆️
.../java/org/opensearch/node/NodeClosedException.java	`50.00% <0.00%> (-50.00%)`	⬇️
...ch/transport/ReceiveTimeoutTransportException.java	`50.00% <0.00%> (-50.00%)`	⬇️
...nsearch/rest/action/cat/RestCatRecoveryAction.java	`43.61% <0.00%> (-42.56%)`	⬇️
...ations/bucket/terms/heuristic/PercentageScore.java	`17.39% <0.00%> (-34.79%)`	⬇️
... and 471 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

saikaranam-amazon

LGTM - Can we change the RFC to reflect the latest contract?

Bukhtawar

Lets add support for per attribute GET

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

imRishN · 2022-10-17T21:57:09Z

@Bukhtawar as discussed, updated the Request path and Response for the GET request. Now, the path will need to have attributeName specified. The response for a valid request will be attributeValue: status.

This is also in consistent with how the WeightedRouting GET request and response implements it.

Thanks for helping simplifying it.

github-actions · 2022-10-17T22:21:11Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/4818/
CommitID: 28e9750

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

github-actions · 2022-10-18T06:03:49Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/4831/
CommitID: 89b107b

Bukhtawar · 2022-10-18T12:47:20Z

.../opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateRequest.java

    }

    @Override
    public ActionRequestValidationException validate() {
-        return null;
+        ActionRequestValidationException validationException = null;
+        if (attributeName == null || Strings.isEmpty(attributeName)) {


nit: Strings.isEmpty

…project#4751) * Add attribute name to query param and simplify GetDecommissionStateResponse Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

* Add DecommissionService and helper to execute awareness attribute decommissioning #4084 * Add APIs (GET/PUT) to decommission awareness attribute #4261 * Controlling discovery for decommissioned nodes #4590 * Fix decommission status update to non leader nodes #4800 * Remove redundant field from GetDecommissionStateResponse #4751 * Service Layer changes for Recommission API #4320 * Recommission api level support #4604 * Fix bug in AwarenessAttributeDecommissionIT #4822 Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

* Add DecommissionService and helper to execute awareness attribute decommissioning opensearch-project#4084 * Add APIs (GET/PUT) to decommission awareness attribute opensearch-project#4261 * Controlling discovery for decommissioned nodes opensearch-project#4590 * Fix decommission status update to non leader nodes opensearch-project#4800 * Remove redundant field from GetDecommissionStateResponse opensearch-project#4751 * Service Layer changes for Recommission API opensearch-project#4320 * Recommission api level support opensearch-project#4604 * Fix bug in AwarenessAttributeDecommissionIT opensearch-project#4822 Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

* Awareness attribute decommission backports (#4970) * Add DecommissionService and helper to execute awareness attribute decommissioning #4084 * Add APIs (GET/PUT) to decommission awareness attribute #4261 * Controlling discovery for decommissioned nodes #4590 * Fix decommission status update to non leader nodes #4800 * Remove redundant field from GetDecommissionStateResponse #4751 * Service Layer changes for Recommission API #4320 * Recommission api level support #4604 * Fix bug in AwarenessAttributeDecommissionIT #4822 Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

…project#4751) * Add attribute name to query param and simplify GetDecommissionStateResponse Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Remove redundant field from GetDecommissionStateResponse

abefb7a

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

imRishN requested review from a team and reta as code owners October 12, 2022 17:23

Add changelog

14628fa

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

imRishN mentioned this pull request Oct 12, 2022

[BUG] [Zone Decommission] GET response has redundant field #4750

Closed

gbbafna approved these changes Oct 13, 2022

View reviewed changes

imRishN added 2 commits October 13, 2022 18:00

Empty-Commit

5b62331

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Merge remote-tracking branch 'upstream/main' into decommission/get-ap…

8caa328

…i-fix

Empty-Commit

77a2567

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Merge remote-tracking branch 'upstream/main' into decommission/get-ap…

a430ba2

…i-fix Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

sachinpkale approved these changes Oct 14, 2022

View reviewed changes

saikaranam-amazon approved these changes Oct 17, 2022

View reviewed changes

Bukhtawar reviewed Oct 17, 2022

View reviewed changes

imRishN added 5 commits October 18, 2022 02:34

Update GET path

4755e6e

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Update GET response

7bc611f

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Add UT

85c6f4f

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Minor refactoring

1291a08

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Fix spotless check

28e9750

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Empty-Commit

89b107b

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

Bukhtawar approved these changes Oct 18, 2022

View reviewed changes

Bukhtawar merged commit f3d038f into opensearch-project:main Oct 18, 2022

This was referenced Oct 18, 2022

Fix bug in AwarenessAttributeDecommissionIT #4822

Merged

[BUG] Failed Integ test testDecommissionStatusUpdatePublishedToAllNodes #4824

Closed

[Zone Decommission] Add route to get decommission status for particular attribute #4640

Closed

imRishN mentioned this pull request Oct 28, 2022

Awareness attribute decommission backports #4970

Merged

6 tasks

imRishN mentioned this pull request Nov 3, 2022

Awareness attribute decommission 2.4 backport #5056

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove redundant field from GetDecommissionStateResponse #4751

Remove redundant field from GetDecommissionStateResponse #4751

imRishN commented Oct 12, 2022 •

edited

Loading

github-actions bot commented Oct 12, 2022

github-actions bot commented Oct 12, 2022

github-actions bot commented Oct 13, 2022

github-actions bot commented Oct 13, 2022

sachinpkale commented Oct 14, 2022

github-actions bot commented Oct 14, 2022

codecov-commenter commented Oct 14, 2022 •

edited

Loading

saikaranam-amazon left a comment

Bukhtawar left a comment

imRishN commented Oct 17, 2022 •

edited

Loading

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 18, 2022

Bukhtawar Oct 18, 2022

Remove redundant field from GetDecommissionStateResponse #4751

Remove redundant field from GetDecommissionStateResponse #4751

Conversation

imRishN commented Oct 12, 2022 • edited Loading

Description

Issues Resolved

Check List

github-actions bot commented Oct 12, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Oct 12, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Oct 13, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Oct 13, 2022

Gradle Check (Jenkins) Run Completed with:

sachinpkale commented Oct 14, 2022

github-actions bot commented Oct 14, 2022

Gradle Check (Jenkins) Run Completed with:

codecov-commenter commented Oct 14, 2022 • edited Loading

Codecov Report

saikaranam-amazon left a comment

Choose a reason for hiding this comment

Bukhtawar left a comment

Choose a reason for hiding this comment

imRishN commented Oct 17, 2022 • edited Loading

github-actions bot commented Oct 17, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Oct 18, 2022

Gradle Check (Jenkins) Run Completed with:

Bukhtawar Oct 18, 2022

Choose a reason for hiding this comment

imRishN commented Oct 12, 2022 •

edited

Loading

codecov-commenter commented Oct 14, 2022 •

edited

Loading

imRishN commented Oct 17, 2022 •

edited

Loading