Add request parameter 'cluster_manager_timeout' as the alternative for 'master_timeout', and deprecate 'master_timeout' - in CAT APIs by tlfeng · Pull Request #2557 · opensearch-project/OpenSearch

tlfeng · 2022-03-22T06:25:19Z

Description

Apply the change of CAT Nodes API in PR #2435 to other applicable CAT APIs.

Deprecate the request parameter master_timeout that used in many CAT APIs.
Add alternative new request parameter cluster_manager_timeout.
Add unit tests.

Issues Resolved

A part of #2511

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

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: Tianli Feng <ftianli@amazon.com>

opensearch-ci-bot · 2022-03-22T07:09:22Z

✅ Gradle Check success 006da61
Log 3658

Reports 3658

Signed-off-by: Tianli Feng <ftianli@amazon.com>

opensearch-ci-bot · 2022-03-22T07:22:34Z

❌ Gradle Check failure fbec303
Log 3659

Reports 3659

opensearch-ci-bot · 2022-03-22T07:58:28Z

✅ Gradle Check success 7274938
Log 3660

Reports 3660

Signed-off-by: Tianli Feng <ftianli@amazon.com>

…aks API Signed-off-by: Tianli Feng <ftianli@amazon.com>

Signed-off-by: Tianli Feng <ftianli@amazon.com>

opensearch-ci-bot · 2022-03-28T23:02:52Z

❌ Gradle Check failure ef81890
Log 3835

Reports 3835

opensearch-ci-bot · 2022-03-28T23:17:04Z

❌ Gradle Check failure 365f0bd
Log 3836

Reports 3836

tlfeng · 2022-03-28T23:22:11Z

In log 3836:

REPRODUCE WITH: ./gradlew ':qa:remote-clusters:integTest' --tests "org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks" -Dtests.seed=5479B92A16DF1BD9 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=tr -Dtests.timezone=Etc/UCT -Druntime.java=17
WARNING: A terminally deprecated method in java.lang.System has been called
WARNING: System::setSecurityManager has been called by org.gradle.api.internal.tasks.testing.worker.TestWorker (file:/home/ubuntu/.gradle/wrapper/dists/gradle-7.3.3-all/4295vidhdd9hd3gbjyw1xqxpo/gradle-7.3.3/lib/plugins/gradle-testing-base-7.3.3.jar)
WARNING: Please consider reporting this to the maintainers of org.gradle.api.internal.tasks.testing.worker.TestWorker
WARNING: System::setSecurityManager will be removed in a future release

org.opensearch.cluster.remote.test.RemoteClustersIT > testHAProxyModeConnectionWorks FAILED
    java.lang.AssertionError
        at __randomizedtesting.SeedInfo.seed([5479B92A16DF1BD9:530F6CE12D596D84]:0)
        at org.junit.Assert.fail(Assert.java:87)
        at org.junit.Assert.assertTrue(Assert.java:42)
        at org.junit.Assert.assertTrue(Assert.java:53)
        at org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks(RemoteClustersIT.java:125)

It's reported in issue #1703

Signed-off-by: Tianli Feng <ftianli@amazon.com>

tlfeng · 2022-03-29T17:26:04Z

server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java

+                indices,
+                indicesOptions,
+                local,
+                clusterManagerNodeTimeout,


Note: the massive change around these lines is only caused by the indentation change, which is made by variable name changed from masterNodeTimeout to clusterManagerNodeTimeout.

opensearch-ci-bot · 2022-03-29T17:52:48Z

✅ Gradle Check success 99e2b7b
Log 3863

Reports 3863

Signed-off-by: Tianli Feng <ftianli@amazon.com>

opensearch-ci-bot · 2022-03-30T05:13:21Z

✅ Gradle Check success e1a4be0
Log 3886

Reports 3886

…r class to reduce duplication Signed-off-by: Tianli Feng <ftianli@amazon.com>

opensearch-ci-bot · 2022-03-30T19:11:19Z

✅ Gradle Check success 80d99fd6ace86da3c8182889ad6d4d11fbe1ab0a
Log 3905

Reports 3905

opensearch-ci-bot · 2022-03-30T19:11:29Z

✅ Gradle Check success f97d74b
Log 3906

Reports 3906

Signed-off-by: Tianli Feng <ftianli@amazon.com> # Conflicts: # server/src/main/java/org/opensearch/rest/BaseRestHandler.java # server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java # server/src/test/java/org/opensearch/action/RenamedTimeoutRequestParameterTests.java

opensearch-ci-bot · 2022-04-01T03:24:23Z

✅ Gradle Check success 4d0eb19a2184e87a8f8612dfe329c41229faca95
Log 4004

Reports 4004

opensearch-ci-bot · 2022-04-01T03:29:52Z

✅ Gradle Check success dc30f42
Log 4005

Reports 4005

mch2

LGTM

…r 'master_timeout', and deprecate 'master_timeout' - in CAT APIs (#2557) Apply the change of CAT Nodes API in PR #2435 to other applicable CAT APIs. - Deprecate the request parameter `master_timeout` that used in many CAT APIs. - Add alternative new request parameter `cluster_manager_timeout`. - Add unit tests. Signed-off-by: Tianli Feng <ftianli@amazon.com> (cherry picked from commit 78465b4)

Tianli Feng added 2 commits March 21, 2022 23:20

Add cluster_manager_timemout in Cat allocation api

92b48f3

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Add cluster_manager_timemout in Cat indices api

006da61

Signed-off-by: Tianli Feng <ftianli@amazon.com>

tlfeng added enhancement Enhancement or improvement to existing feature or request Severity-Blocker v2.0.0 Version 2.0.0 WIP Work in progress labels Mar 22, 2022

Tianli Feng added 2 commits March 22, 2022 01:11

Modify unit test to test more scenario

fbec303

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Adjust format by spotlessApply task

7274938

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Tianli Feng added 5 commits March 28, 2022 10:43

Merge branch 'main' into cluster-manager-timeout-cat

b99dbed

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Deprecate master_timeout parameter in cat cluster_manager API

11c155a

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Deprecate master_timeout parameter in cat nodeattrs and cat pending t…

0690d8e

…aks API Signed-off-by: Tianli Feng <ftianli@amazon.com>

Deprecate master_timeout parameter in many cat API

ef81890

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Adjust format by spotlessApply task

365f0bd

Signed-off-by: Tianli Feng <ftianli@amazon.com>

tlfeng added backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch and removed WIP Work in progress labels Mar 28, 2022

Merge branch 'main' into cluster-manager-timeout-cat

99e2b7b

Signed-off-by: Tianli Feng <ftianli@amazon.com>

tlfeng commented Mar 29, 2022

View reviewed changes

tlfeng marked this pull request as ready for review March 29, 2022 17:28

tlfeng requested a review from a team as a code owner March 29, 2022 17:28

tlfeng mentioned this pull request Mar 29, 2022

Add a new request parameter "cluster_manager_timeout" in the REST APIs that accept "master_timeout" parameter, and deprecate "master_timeout" #2511

Closed

11 tasks

Tianli Feng added 2 commits March 29, 2022 21:21

Deprecate master_timeout parameter in Cat segments API

f1801c3

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Merge branch 'main' into cluster-manager-timeout-cat

e1a4be0

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Move parseDeprecatedMasterTimeoutParameter method into BaseRestHandle…

f97d74b

…r class to reduce duplication Signed-off-by: Tianli Feng <ftianli@amazon.com>

tlfeng force-pushed the cluster-manager-timeout-cat branch from 80d99fd to f97d74b Compare March 30, 2022 18:25

tlfeng added the WIP Work in progress label Mar 30, 2022

This was referenced Mar 30, 2022

Centralize codes related to 'master_timeout' deprecation for eaiser removal - in CAT Nodes API #2670

Merged

Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in Cluster APIs #2658

Merged

tlfeng removed the Severity-Blocker label Mar 31, 2022

tlfeng force-pushed the cluster-manager-timeout-cat branch from 4d0eb19 to dc30f42 Compare April 1, 2022 02:40

tlfeng removed the WIP Work in progress label Apr 1, 2022

mch2 approved these changes Apr 1, 2022

View reviewed changes

tlfeng merged commit 78465b4 into opensearch-project:main Apr 1, 2022

opensearch-trigger-bot bot mentioned this pull request Apr 1, 2022

[Backport 2.x] Add request parameter 'cluster_manager_timeout' as the alternative for 'master_timeout', and deprecate 'master_timeout' - in CAT APIs #2716

Merged

opensearch-trigger-bot bot mentioned this pull request Apr 1, 2022

[Backport 2.0] Add request parameter 'cluster_manager_timeout' as the alternative for 'master_timeout', and deprecate 'master_timeout' - in CAT APIs #2717

Merged

tlfeng deleted the cluster-manager-timeout-cat branch April 11, 2022 22:47

Conversation

tlfeng commented Mar 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues Resolved

Check List

Uh oh!

opensearch-ci-bot commented Mar 22, 2022

Uh oh!

opensearch-ci-bot commented Mar 22, 2022

Uh oh!

opensearch-ci-bot commented Mar 22, 2022

Uh oh!

opensearch-ci-bot commented Mar 28, 2022

Uh oh!

opensearch-ci-bot commented Mar 28, 2022

Uh oh!

tlfeng commented Mar 28, 2022

Uh oh!

tlfeng Mar 29, 2022

Choose a reason for hiding this comment

Uh oh!

opensearch-ci-bot commented Mar 29, 2022

Uh oh!

opensearch-ci-bot commented Mar 30, 2022

Uh oh!

opensearch-ci-bot commented Mar 30, 2022

Uh oh!

opensearch-ci-bot commented Mar 30, 2022

Uh oh!

opensearch-ci-bot commented Apr 1, 2022

Uh oh!

opensearch-ci-bot commented Apr 1, 2022

Uh oh!

mch2 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tlfeng commented Mar 22, 2022 •

edited

Loading