Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

tlfeng · 2022-02-17T04:07:00Z

Description

Replace the non-inclusive terminology "master" with "cluster manager" in code comments, internal variable/method/class names, where the backwards compatibility is not impacted.

Replacement rules:

master -> cluster_manager or clusterManager (variable name) or cluster manager (code comment)
e.g. master node -> cluster_manager node
Master -> ClusterManager

Issues Resolved

Resolve #1548

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 <[email protected]>

opensearch-ci-bot · 2022-02-17T04:08:03Z

Can one of the admins verify this patch?

client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java

opensearch-ci-bot · 2022-02-17T04:41:29Z

❌ Gradle Check failure 9026aed
Log 2483

Reports 2483

tlfeng · 2022-02-17T04:56:32Z

In log 2483:

> Task :qa:mixed-cluster:v1.3.0#mixedClusterTest

REPRODUCE WITH: ./gradlew ':qa:mixed-cluster:v1.3.0#mixedClusterTest' --tests "org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT"

I will check the cause for this failure.

VachaShah · 2022-02-17T07:16:35Z

client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java

@@ -47,7 +47,7 @@
    public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30);


You might also want to update this variable name.

Thank you for the review!
I think I'm not going to rename this variable name. It's a Java API which may break the compatibility to other software that uses server package: https://opensearch.org/javadocs/1.2.4/OpenSearch/server/build/docs/javadoc/org/opensearch/action/support/master/MasterNodeRequest.html#DEFAULT_MASTER_NODE_TIMEOUT
The current plan is to replace all those names in Java API directly in version 3.0.0 .

Ah okay! Thank you :)

VachaShah · 2022-02-17T07:21:35Z

MixedClusterClientYamlTestSuiteIT

This is related to #2143.

tlfeng · 2022-02-17T22:09:54Z

MixedClusterClientYamlTestSuiteIT

This is related to #2143.

Thanks a lot for this pointer 👍😄

…rnal Signed-off-by: Tianli Feng <[email protected]> # Conflicts: # test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java

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

opensearch-ci-bot · 2022-03-16T04:47:31Z

✅ Gradle Check success 4f1211c
Log 3429

Reports 3429

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

✅ Gradle Check success 717bc11
Log 3430

Reports 3430

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

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

✅ Gradle Check success 36a5bbe
Log 3485

Reports 3485

opensearch-ci-bot · 2022-03-19T07:34:35Z

❌ Gradle Check failure 463eade6817ee7d0c8953345607b439fdde148ac
Log 3537

Reports 3537

opensearch-ci-bot · 2022-03-19T07:34:49Z

❌ Gradle Check failure f20c02998f38fdea96166c32c471be879316cb18
Log 3538

Reports 3538

opensearch-ci-bot · 2022-03-19T07:46:33Z

❌ Gradle Check failure 6ad42d973e5910dfd5ce6c4df0ffa13c07e90d41
Log 3539

Reports 3539

tlfeng · 2022-03-19T07:52:51Z

In log 3539:

> Task :client:rest-high-level:asyncIntegTest

REPRODUCE WITH: ./gradlew ':client:rest-high-level:asyncIntegTest' --tests "org.opensearch.client.ClusterClientIT.testClusterHealthYellowIndicesLevel" -Dtests.seed=CC36987E39D8B3EA -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ca-ES -Dtests.timezone=America/Mazatlan -Druntime.java=17

org.opensearch.client.ClusterClientIT > testClusterHealthYellowIndicesLevel FAILED
    UncategorizedExecutionException[Failed execution]; nested: ExecutionException[java.io.IOException: Unable to parse response body for Response{requestLine=GET /_cluster/health/index,index2?master_timeout=5s&level=indices&timeout=5s HTTP/1.1, host=http://127.0.0.1:46587, response=HTTP/1.1 200 OK}]; nested: IOException[Unable to parse response body for Response{requestLine=GET /_cluster/health/index,index2?master_timeout=5s&level=indices&timeout=5s HTTP/1.1, host=http://127.0.0.1:46587, response=HTTP/1.1 200 OK}]; nested: IllegalArgumentException[Required [discovered_cluster_manager]];
        at __randomizedtesting.SeedInfo.seed([CC36987E39D8B3EA:5ABFCEA0918E637F]:0)
        at app//org.opensearch.common.util.concurrent.FutureUtils.rethrowExecutionException(FutureUtils.java:104)
        at app//org.opensearch.common.util.concurrent.FutureUtils.get(FutureUtils.java:74)
        at app//org.opensearch.action.support.AdapterActionFuture.actionGet(AdapterActionFuture.java:50)
        at app//org.opensearch.client.OpenSearchRestHighLevelClientTestCase.execute(OpenSearchRestHighLevelClientTestCase.java:134)
        at app//org.opensearch.client.OpenSearchRestHighLevelClientTestCase.execute(OpenSearchRestHighLevelClientTestCase.java:117)
        at app//org.opensearch.client.ClusterClientIT.testClusterHealthYellowIndicesLevel(ClusterClientIT.java:248)

> Task :rest-api-spec:yamlRestTest

REPRODUCE WITH: ./gradlew ':rest-api-spec:yamlRestTest' --tests "org.opensearch.test.rest.ClientYamlTestSuiteIT" -Dtests.method="test {p0=cluster.health/10_basic/Get cluster health has same value for discovered_master and discovered_cluster_manager}" -Dtests.seed=CC36987E39D8B3EA -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ja -Dtests.timezone=America/Noronha -Druntime.java=17

org.opensearch.test.rest.ClientYamlTestSuiteIT > test {p0=cluster.health/10_basic/Get cluster health has same value for discovered_master and discovered_cluster_manager} FAILED
    java.lang.AssertionError: Failure at [cluster.health/10_basic:290]: field [discovered_cluster_manager] is null
        at __randomizedtesting.SeedInfo.seed([CC36987E39D8B3EA:4462A7A49724DE12]:0)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.executeSection(OpenSearchClientYamlSuiteTestCase.java:454)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.test(OpenSearchClientYamlSuiteTestCase.java:427)

Signed-off-by: Tianli Feng <[email protected]> # Conflicts: # buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy # client/rest/src/main/java/org/opensearch/client/Node.java # server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java # server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java # server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java # server/src/test/java/org/opensearch/cluster/coordination/NoMasterBlockServiceTests.java # server/src/test/java/org/opensearch/env/NodeRepurposeCommandTests.java # test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java

opensearch-ci-bot · 2022-03-19T08:20:45Z

❌ Gradle Check failure 5bd150aaa6669306b73c1e5117a2327fb679543d
Log 3542

Reports 3542

opensearch-ci-bot · 2022-03-19T08:44:52Z

❌ Gradle Check failure 0817155
Log 3546

Reports 3546

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

opensearch-ci-bot · 2022-03-19T09:21:49Z

❌ Gradle Check failure 3c204eb
Log 3549

Reports 3549

tlfeng · 2022-03-19T17:09:27Z

In log 3549:

REPRODUCE WITH: ./gradlew ':qa:remote-clusters:integTest' --tests "org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks" -Dtests.seed=AD318DBD0523C5F5 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=nn-NO -Dtests.timezone=Africa/Sao_Tome -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([AD318DBD0523C5F5:AA4758763EA5B3A8]: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.
start gradle check

opensearch-ci-bot · 2022-03-19T18:03:59Z

✅ Gradle Check success 3c204eb
Log 3557

Reports 3557

tlfeng · 2022-03-19T18:08:28Z

The PR will be split into smaller ones, based on the changes in different directories. See issue #1548 for the split PRs. (Such as PR #2519 #2520 #2521)

Tianli Feng and others added 16 commits February 14, 2022 16:36

Replace master in NoMasterBlockService class

45ee23d

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

Replace master in Coordinator class

b597d96

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

Replace master in ClusterHealthResponse class

e71406e

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

Replace master in Method withMasterTimeout()

541ce80

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

Replace master in TimedRequest class

7679794

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

Replace master in Method get/setMasterTimeout()

c80b14f

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

Replace master of method SetRandomMasterTimeout()

f1a63ef

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

Replace master in subprojects - client modules plugins qa

998e88d

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

Replace master in TestCluster classes

50f0de0

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

Replace master in test.framework test classes

cbc71a2

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

Replace master terminology in classes of server directories

9835546

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

adjust format by spotlessApply

9b4719b

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

Replace master terminology in classes of server directories - leftover

b41fe3b

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

Replace master in server classes - leftover

e2e9347

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

Adjust format by spotlessApply task

1e42576

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

Replace master in server test classes

9026aed

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

tlfeng added v2.0.0 Version 2.0.0 v1.3.0 backport 1.x labels Feb 17, 2022

tlfeng commented Feb 17, 2022

View reviewed changes

client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java Show resolved Hide resolved

client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java Outdated Show resolved Hide resolved

tlfeng marked this pull request as ready for review February 17, 2022 04:30

tlfeng requested a review from a team as a code owner February 17, 2022 04:30

VachaShah reviewed Feb 17, 2022

View reviewed changes

Tianli Feng added 2 commits February 17, 2022 14:52

Merge remote-tracking branch 'upstream/main' into replace-master-inte…

63282ff

…rnal Signed-off-by: Tianli Feng <[email protected]> # Conflicts: # test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java

Adjust format by spotlessApply task

8af6374

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

Merge branch 'main' into replace-master-internal

36a5bbe

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

tlfeng force-pushed the replace-master-internal branch from 463eade to f20c029 Compare March 19, 2022 07:16

tlfeng added blocked Identifies issues that are blocked labels Mar 19, 2022

tlfeng force-pushed the replace-master-internal branch from f20c029 to 6ad42d9 Compare March 19, 2022 07:25

tlfeng mentioned this pull request Mar 19, 2022

Replace internal usages of 'master' terminology in server directory #2518

Closed

5 tasks

tlfeng force-pushed the replace-master-internal branch from 6ad42d9 to 5bd150a Compare March 19, 2022 07:37

tlfeng force-pushed the replace-master-internal branch from 5bd150a to 0817155 Compare March 19, 2022 08:18

tlfeng mentioned this pull request Mar 19, 2022

Replace internal usages of 'master' term in 'server/src/main' directory #2519

Merged

5 tasks

Restore rename DISCOVERED_MASTER in ClusterHealthResponse

3c204eb

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

This was referenced Mar 19, 2022

Replace internal usages of 'master' term in 'server/src/test' directory #2520

Merged

Replace internal usages of 'master' term in 'server/src/internalClusterTest' directory #2521

Merged

tlfeng closed this Mar 19, 2022

tlfeng removed the blocked Identifies issues that are blocked label Mar 19, 2022

tlfeng deleted the replace-master-internal branch April 26, 2022 22:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

tlfeng commented Feb 17, 2022 •

edited

Loading

opensearch-ci-bot commented Feb 17, 2022

opensearch-ci-bot commented Feb 17, 2022

tlfeng commented Feb 17, 2022

VachaShah Feb 17, 2022

tlfeng Feb 17, 2022 •

edited

Loading

VachaShah Feb 17, 2022

VachaShah commented Feb 17, 2022

tlfeng commented Feb 17, 2022

opensearch-ci-bot commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

opensearch-ci-bot commented Mar 17, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

		@@ -47,7 +47,7 @@
		public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30);

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

Conversation

tlfeng commented Feb 17, 2022 • edited Loading

Description

Issues Resolved

Check List

opensearch-ci-bot commented Feb 17, 2022

opensearch-ci-bot commented Feb 17, 2022

tlfeng commented Feb 17, 2022

VachaShah Feb 17, 2022

Choose a reason for hiding this comment

tlfeng Feb 17, 2022 • edited Loading

Choose a reason for hiding this comment

VachaShah Feb 17, 2022

Choose a reason for hiding this comment

VachaShah commented Feb 17, 2022

tlfeng commented Feb 17, 2022

opensearch-ci-bot commented Mar 16, 2022

opensearch-ci-bot commented Mar 16, 2022

opensearch-ci-bot commented Mar 17, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

opensearch-ci-bot commented Mar 19, 2022

tlfeng commented Mar 19, 2022

tlfeng commented Feb 17, 2022 •

edited

Loading

tlfeng Feb 17, 2022 •

edited

Loading