Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' #2437

tlfeng · 2022-03-11T04:04:31Z

Description

Add a new field discovered_cluster_manager to the response of GET _cluster/health API, which has got the same value with the existing discovered_master field, aims to replace the non-inclusive term "master" in the API response field.
Add yaml rest test to validate discovered_cluster_manager and discovered_master field have got the same value.

Current response of GET _cluster/health API

{
  "cluster_name" : "opensearch",
  "status" : "green",
  "timed_out" : false,
  "number_of_nodes" : 1,
  "number_of_data_nodes" : 1,
  "discovered_master" : true,
...
}

Proposed response of GET _cluster/health API

{
  "cluster_name" : "opensearch",
  "status" : "green",
  "timed_out" : false,
  "number_of_nodes" : 1,
  "number_of_data_nodes" : 1,
  "discovered_master" : true,
  "discovered_cluster_manager" : true,
...
}

Testing:

  ./gradlew ':rest-api-spec:yamlRestTest' \
  --tests "org.opensearch.test.rest.ClientYamlTestSuiteIT" \
  -Dtests.method="test {p0=cluster.health/10_basic/*}"

Issues Resolved

Part of #1549

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.

opensearch-ci-bot · 2022-03-11T04:06:02Z

Can one of the admins verify this patch?

opensearch-ci-bot · 2022-03-11T04:36:15Z

❌ Gradle Check failure 12d6f676976220d00e1ca4d2684ea2a74495b321
Log 3250

Reports 3250

Signed-off-by: Tianli Feng <[email protected]>

opensearch-ci-bot · 2022-03-11T05:25:34Z

❌ Gradle Check failure 0148e0e
Log 3252

Reports 3252

tlfeng · 2022-03-11T05:38:29Z

In log 3252:

REPRODUCE WITH: ./gradlew ':qa:mixed-cluster:v1.2.5#mixedClusterTest' --tests "org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT" -Dtests.method="test {p0=indices.get_field_mapping/20_missing_field/Return empty object if field doesn't exist, but index does}" -Dtests.seed=9FC2465A92C8B157 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=uk-UA -Dtests.timezone=Australia/Hobart -Druntime.java=17

org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT > test {p0=indices.get_field_mapping/20_missing_field/Return empty object if field doesn't exist, but index does} FAILED
    java.lang.AssertionError: Failure at [indices.get_field_mapping/20_missing_field:13]: expected [2xx] status code but api [indices.get_field_mapping] returned [404 Not Found] [{}]
        at __randomizedtesting.SeedInfo.seed([9FC2465A92C8B157:179679803C34DCAF]:0)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.executeSection(OpenSearchClientYamlSuiteTestCase.java:442)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.test(OpenSearchClientYamlSuiteTestCase.java:415)

It's not reproducible locally. Opened issue #2440

dblock · 2022-03-11T18:59:48Z

start gradle check

opensearch-ci-bot · 2022-03-11T19:41:54Z

❌ Gradle Check failure 0148e0e
Log 3266

Reports 3266

tlfeng · 2022-03-11T19:43:39Z

Log 3266 shows the same test failure as above, now I begin to doubt if that is caused by the code change.. 😂 But it's not reproducible by the single command ./gradlew ':qa:mixed-cluster:v1.2.5#mixedClusterTest' --tests "org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT" -Dtests.method="test {p0=indices.get_field_mapping/20_missing_field/Return empty object if field doesn't exist, but index does}" -Dtests.seed=9FC2465A92C8B157
Update: It's tracked in issue #2440

tlfeng · 2022-03-15T05:16:34Z

start gradle check

opensearch-ci-bot · 2022-03-15T06:04:24Z

❌ Gradle Check failure 0148e0e
Log 3388

Reports 3388

…ster-health Signed-off-by: Tianli Feng <[email protected]>

opensearch-ci-bot · 2022-03-15T21:37:26Z

❌ Gradle Check failure c05d14c
Log 3422

Reports 3422

tlfeng · 2022-03-15T21:37:27Z

In log 3422:

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards" -Dtests.seed=72EABB7906B3AA3D -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=en-IN -Dtests.timezone=America/Tegucigalpa -Druntime.java=17
   2> java.lang.AssertionError: AcknowledgedResponse failed - not acked
     Expected: <true>
          but: was <false>
        at __randomizedtesting.SeedInfo.seed([72EABB7906B3AA3D:5E9BB19817AD80DF]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:127)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:131)
        at org.opensearch.test.TestCluster.wipeIndices(TestCluster.java:167)
        at org.opensearch.test.TestCluster.wipe(TestCluster.java:90)
        at org.opensearch.test.OpenSearchIntegTestCase.afterInternal(OpenSearchIntegTestCase.java:601)
        at org.opensearch.test.OpenSearchIntegTestCase.cleanUpCluster(OpenSearchIntegTestCase.java:2235)
...

It's reported in issue #1561

dreamer-89

LGTM!

dreamer-89 · 2022-03-16T04:17:22Z

start gradle check

opensearch-ci-bot · 2022-03-16T05:05:49Z

❌ Gradle Check failure c05d14c
Log 3432

Reports 3432

tlfeng · 2022-03-16T05:07:18Z

In log 3432:

> Task :qa:remote-clusters:integTest

REPRODUCE WITH: ./gradlew ':qa:remote-clusters:integTest' --tests "org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks" -Dtests.seed=A9A05CBF01AE3B80 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ar-DZ -Dtests.timezone=America/Cayman -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([A9A05CBF01AE3B80:AED689743A284DDD]: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 · 2022-03-16T06:04:40Z

start gradle check

opensearch-ci-bot · 2022-03-16T06:39:19Z

❌ Gradle Check failure c05d14c
Log 3436

Reports 3436

tlfeng · 2022-03-16T16:37:29Z

In log 3436:

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards" -Dtests.seed=B0C5A531120FFD2 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=es-PR -Dtests.timezone=America/Coral_Harbour -Druntime.java=17

org.opensearch.cluster.allocation.ClusterRerouteIT > testDelayWithALargeAmountOfShards FAILED
    java.lang.AssertionError: AcknowledgedResponse failed - not acked
    Expected: <true>
         but: was <false>
        at __randomizedtesting.SeedInfo.seed([B0C5A531120FFD2:277D50B2003ED530]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:127)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:131)
        at org.opensearch.test.TestCluster.wipeIndices(TestCluster.java:167)
        at org.opensearch.test.TestCluster.wipe(TestCluster.java:90)
        at org.opensearch.test.OpenSearchIntegTestCase.afterInternal(OpenSearchIntegTestCase.java:601)
        at org.opensearch.test.OpenSearchIntegTestCase.cleanUpCluster(OpenSearchIntegTestCase.java:2235)

It's reported in issue #1561

Signed-off-by: Tianli Feng <[email protected]>

opensearch-ci-bot · 2022-03-17T11:37:27Z

❌ Gradle Check failure 55a62d4
Log 3484

Reports 3484

tlfeng · 2022-03-17T18:45:45Z

In log 3484:
It's not reproducible locally.

> Task :server:internalClusterTest

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.aliases.IndexAliasesIT.testSameAlias" -Dtests.seed=42844E403B1AF12C -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=cs-CZ -Dtests.timezone=America/Argentina/Salta -Druntime.java=17

org.opensearch.aliases.IndexAliasesIT > testSameAlias FAILED
    java.lang.AssertionError: AcknowledgedResponse failed - not acked
    Expected: <true>
         but: was <false>
        at __randomizedtesting.SeedInfo.seed([42844E403B1AF12C:C0C7FB8A9CF2AB0A]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:127)
        at org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked(OpenSearchAssertions.java:115)
        at org.opensearch.aliases.IndexAliasesIT.lambda$testSameAlias$54(IndexAliasesIT.java:820)
        at org.opensearch.aliases.IndexAliasesIT.assertAliasesVersionIncreases(IndexAliasesIT.java:1489)
        at org.opensearch.aliases.IndexAliasesIT.assertAliasesVersionIncreases(IndexAliasesIT.java:1480)
        at org.opensearch.aliases.IndexAliasesIT.testSameAlias(IndexAliasesIT.java:818)

Signed-off-by: Tianli Feng <[email protected]>

opensearch-ci-bot · 2022-03-17T19:48:25Z

✅ Gradle Check success 28c671a
Log 3496

Reports 3496

tlfeng added enhancement Enhancement or improvement to existing feature or request v2.0.0 Version 2.0.0 documentation pending Tracks issues which have PRs merged but documentation changes pending >breaking Identifies a breaking change. labels Mar 11, 2022

tlfeng requested a review from a team as a code owner March 11, 2022 04:04

tlfeng changed the title ~~Add a field discovered_cluster_manager in get cluster health api~~ Add a new field 'discovered_cluster_manager' in 'GET Cluster Health' API, which having the same value with 'discovered_master' Mar 11, 2022

tlfeng changed the title ~~Add a new field 'discovered_cluster_manager' in 'GET Cluster Health' API, which having the same value with 'discovered_master'~~ Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' Mar 11, 2022

tlfeng mentioned this pull request Mar 11, 2022

Add alternative usages for the REST APIs and configurations that contain "master" terminology #1549

Closed

12 tasks

Add a field discovered_cluster_manager in get cluster health api

0148e0e

Signed-off-by: Tianli Feng <[email protected]>

tlfeng force-pushed the cluster-manager-cluster-health branch from 12d6f67 to 0148e0e Compare March 11, 2022 04:45

tlfeng mentioned this pull request Mar 11, 2022

[BUG] Flaky test failure - v1.2.5#mixedClusterTest - yaml rest test - indices.get_field_mapping #2440

Closed

dblock requested a review from kartg March 11, 2022 18:59

Merge remote-tracking branch 'upstream/main' into cluster-manager-clu…

c05d14c

…ster-health Signed-off-by: Tianli Feng <[email protected]>

tlfeng requested review from dreamer-89 and removed request for kartg March 16, 2022 02:33

dreamer-89 approved these changes Mar 16, 2022

View reviewed changes

kartg approved these changes Mar 16, 2022

View reviewed changes

kartg mentioned this pull request Mar 16, 2022

Replace 'discovered_master' with 'discovered_cluster_manager' in 'GET Cat Health' API #2438

Merged

5 tasks

Merge branch 'main' into cluster-manager-cluster-health

55a62d4

Signed-off-by: Tianli Feng <[email protected]>

Merge branch 'main' into cluster-manager-cluster-health

28c671a

Signed-off-by: Tianli Feng <[email protected]>

tlfeng merged commit 1c2bdd8 into opensearch-project:main Mar 18, 2022

tlfeng deleted the cluster-manager-cluster-health branch March 18, 2022 22:03

lukas-vlcek mentioned this pull request May 5, 2022

Add missing wait_for_nodes param in Cluster health Reference REST API opensearch-project/documentation-website#553

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' #2437

Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' #2437

tlfeng commented Mar 11, 2022 •

edited

Loading

opensearch-ci-bot commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

tlfeng commented Mar 11, 2022 •

edited

Loading

dblock commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

tlfeng commented Mar 11, 2022 •

edited

Loading

tlfeng commented Mar 15, 2022

opensearch-ci-bot commented Mar 15, 2022

opensearch-ci-bot commented Mar 15, 2022

tlfeng commented Mar 15, 2022

dreamer-89 left a comment

dreamer-89 commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

tlfeng commented Mar 16, 2022 •

edited

Loading

tlfeng commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

tlfeng commented Mar 16, 2022 •

edited

Loading

opensearch-ci-bot commented Mar 17, 2022

tlfeng commented Mar 17, 2022

opensearch-ci-bot commented Mar 17, 2022

Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' #2437

Add a field 'discovered_cluster_manager' in 'GET Cluster Health' API that shows identical value with field 'discovered_master' #2437

Conversation

tlfeng commented Mar 11, 2022 • edited Loading

Description

Issues Resolved

Check List

opensearch-ci-bot commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

tlfeng commented Mar 11, 2022 • edited Loading

dblock commented Mar 11, 2022

opensearch-ci-bot commented Mar 11, 2022

tlfeng commented Mar 11, 2022 • edited Loading

tlfeng commented Mar 15, 2022

opensearch-ci-bot commented Mar 15, 2022

opensearch-ci-bot commented Mar 15, 2022

tlfeng commented Mar 15, 2022

dreamer-89 left a comment

Choose a reason for hiding this comment

dreamer-89 commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

tlfeng commented Mar 16, 2022 • edited Loading

tlfeng commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

tlfeng commented Mar 16, 2022 • edited Loading

opensearch-ci-bot commented Mar 17, 2022

tlfeng commented Mar 17, 2022

opensearch-ci-bot commented Mar 17, 2022

tlfeng commented Mar 11, 2022 •

edited

Loading

tlfeng commented Mar 11, 2022 •

edited

Loading

tlfeng commented Mar 11, 2022 •

edited

Loading

tlfeng commented Mar 16, 2022 •

edited

Loading

tlfeng commented Mar 16, 2022 •

edited

Loading