Skip to content

[Backport 2.x] Centralize codes related to 'master_timeout' deprecation for eaiser removal - in CAT Nodes API#2695

Merged
tlfeng merged 1 commit into2.xfrom
backport/backport-2670-to-2.x
Apr 1, 2022
Merged

[Backport 2.x] Centralize codes related to 'master_timeout' deprecation for eaiser removal - in CAT Nodes API#2695
tlfeng merged 1 commit into2.xfrom
backport/backport-2670-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

@opensearch-trigger-bot opensearch-trigger-bot bot commented Apr 1, 2022

Backport e1ee222 from #2670

@github-actions
Centralize codes related to 'master_timeout' deprecation for eaiser r…
a0c18d4 
…emoval - in CAT Nodes API (#2670)

* Move parseDeprecatedMasterTimeoutParameter method into BaseRestHandler class to reduce duplication

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

* Add more comments to unit test

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

* Make log message key different

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

* Prohibit using 'master_timeout' and 'cluster_manager_timeout' parameter together

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

* Add separate unit tests for BaseRestHandler.parseDeprecatedMasterTimeoutParameter()

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

* Restore unit test for cat allocation api

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

* Adjust format by spotlessApply task

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

* Fix testBothParamsNotValid() by adding warning assertion

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit e1ee222)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team as a code owner April 1, 2022 01:26
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Apr 1, 2022

❌   Gradle Check failure a0c18d4
Log 4003

Reports 4003

@tlfeng
Copy link
Copy Markdown
Contributor

tlfeng commented Apr 1, 2022

In log 4003:

> Task :qa:remote-clusters:integTest

REPRODUCE WITH: ./gradlew ':qa:remote-clusters:integTest' --tests "org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks" -Dtests.seed=E2D380E7D5276C04 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=es-CU -Dtests.timezone=ACT -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.4.2-all/9uukhhbclvbegdvsww0j0cr3p/gradle-7.4.2/lib/plugins/gradle-testing-base-7.4.2.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([E2D380E7D5276C04:E5A5552CEEA11A59]: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

@tlfeng tlfeng added enhancement Enhancement or improvement to existing feature or request backport PRs or issues specific to backporting features or enhancments v2.1.0 Issues and PRs related to version 2.1.0 labels Apr 1, 2022
@tlfeng
Copy link
Copy Markdown
Contributor

tlfeng commented Apr 1, 2022

start gradle check

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Apr 1, 2022

✅   Gradle Check success a0c18d4
Log 4008

Reports 4008

@tlfeng tlfeng merged commit dcfa3fb into 2.x Apr 1, 2022
@tlfeng tlfeng deleted the backport/backport-2670-to-2.x branch April 1, 2022 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mch2 mch2 mch2 approved these changes

Assignees

No one assigned

Labels

backport PRs or issues specific to backporting features or enhancments enhancement Enhancement or improvement to existing feature or request v2.1.0 Issues and PRs related to version 2.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@opensearch-ci-bot @tlfeng @mch2