[Backport 2.x] Rename public classes with 'Master' to 'ClusterManager' #3870

opensearch-trigger-bot · 2022-07-12T21:44:12Z

Backport a7e113a from #3619

Description:
Replace master terminology by cluster manager in the public Java APIs to support inclusive language.
The PR deal with the public class name in the repository (except for those covered in issue #3542).

Replace Master to ClusterManager for all the classes, including all the references to the classes.

The above changes are done by the Rename refactoring feature of IntelliJ IDEA, so that both the definition and reference can be renamed.

The next PR will be like de21446, adding back the classes in old name for backwards compatibility, so this will not be a breaking change eventually.

List of classes that renamed in this PR:
sever directory:
interface LocalNodeMasterListener -> LocalNodeClusterManagerListener
final class MasterNodeChangePredicate -> ClusterManagerNodeChangePredicate
NotMasterException -> NotClusterManagerException
NoMasterBlockService -> NoClusterManagerBlockService
UnsafeBootstrapMasterCommand - UnsafeBootstrapClusterManagerCommand
MasterNotDiscoveredException -> ClusterManagerNotDiscoveredException
RestMasterAction -> RestClusterManagerAction

List of classes that are not renamed:
sever directory:
MasterService
test/framework directory:
FakeThreadPoolMasterService
BlockMasterServiceOnMaster
BusyMasterServiceDisruption

Replace master terminology by cluster manager in the public Java APIs to support inclusive language. The PR deal with the public class name in the repository (except for those covered in issue #3542). * Replace Master to ClusterManager for all the classes, including all the references to the classes. The next PR will be like de21446, adding back the classes in old name for backwards compatibility. List of classes that renamed in this PR: sever directory: interface LocalNodeMasterListener -> LocalNodeClusterManagerListener final class MasterNodeChangePredicate -> ClusterManagerNodeChangePredicate NotMasterException -> NotClusterManagerException NoMasterBlockService -> NoClusterManagerBlockService UnsafeBootstrapMasterCommand - UnsafeBootstrapClusterManagerCommand MasterService -> UnsafeBootstrapClusterManagerCommand MasterNotDiscoveredException -> ClusterManagerNotDiscoveredException RestMasterAction -> RestClusterManagerAction test/framework directory: FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnMaster BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption Signed-off-by: Tianli Feng <ftianli@amazon.com> (cherry picked from commit a7e113a)

github-actions · 2022-07-12T22:11:53Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/475/
CommitID: 25fe61b

tlfeng · 2022-07-12T22:14:36Z

In build 475

> Task :server:internalClusterTest

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testHighWatermarkNotExceeded" -Dtests.seed=252D2361017E5750 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ja-JP-u-ca-japanese-x-lvariant-JP -Dtests.timezone=America/Creston -Druntime.java=17

org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT > testHighWatermarkNotExceeded FAILED
    java.lang.AssertionError: Mismatching shard routings: []
    Expected: a collection with size <1>
         but: collection size was <0>
        at __randomizedtesting.SeedInfo.seed([252D2361017E5750:CC0CC2D381B89EBE]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:964)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.lambda$assertBusyWithDiskUsageRefresh$5(DiskThresholdDeciderIT.java:362)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1049)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.assertBusyWithDiskUsageRefresh(DiskThresholdDeciderIT.java:355)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testHighWatermarkNotExceeded(DiskThresholdDeciderIT.java:188)

It's reported in issue #3579

github-actions · 2022-07-12T22:47:14Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/476/
CommitID: 25fe61b

codecov-commenter · 2022-07-12T22:48:50Z

Codecov Report

❗ No coverage uploaded for pull request base (2.x@8b53c51). Click here to learn what that means.
The diff coverage is n/a.

@@          Coverage Diff           @@
##             2.x    #3870   +/-   ##
======================================
  Coverage       ?   70.51%           
  Complexity     ?    56330           
======================================
  Files          ?     4520           
  Lines          ?   271634           
  Branches       ?    39972           
======================================
  Hits           ?   191534           
  Misses         ?    63991           
  Partials       ?    16109

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8b53c51...ef3a98a. Read the comment docs.

tlfeng · 2022-07-12T22:54:36Z

@reta Thank you for your review!

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

github-actions · 2022-07-12T23:56:32Z

Gradle Check (Jenkins) Run Completed with:

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

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

github-actions · 2022-07-13T00:30:54Z

Gradle Check (Jenkins) Run Completed with:

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

tlfeng · 2022-07-13T00:32:03Z

In build 487, it's the test failure of #3579

github-actions · 2022-07-13T00:55:59Z

Gradle Check (Jenkins) Run Completed with:

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

tlfeng · 2022-07-13T01:00:14Z

In build 491, the test failure is reported in issue #3650

github-actions · 2022-07-13T02:05:56Z

Gradle Check (Jenkins) Run Completed with:

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

tlfeng · 2022-07-13T03:15:08Z

in build 494:


  2> REPRODUCE WITH: ./gradlew ':qa:smoke-test-multinode:integTest' --tests "org.opensearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT" -Dtests.method="test {yaml=indices.open/10_basic/Basic test for index open/close}" -Dtests.seed=92C399F2076DFC1A -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=mt -Dtests.timezone=America/Dawson_Creek -Druntime.java=17
  2> java.lang.Exception: Test abandoned because suite timeout was reached.
        at __randomizedtesting.SeedInfo.seed([92C399F2076DFC1A]:0)
  2> Lul 12, 2022 6:49:46 WN com.carrotsearch.randomizedtesting.ThreadLeakControl checkThreadLeaks
  2> WARNING: Will linger awaiting termination of 292 leaked thread(s).
  1> [2022-07-12T18:49:46,512][INFO ][o.o.s.SmokeTestMultiNodeClientYamlTestSuiteIT] [test] [yaml=indices.open/10_basic/Basic test for index open/close] after test
  2> java.lang.Exception: Suite timeout exceeded (>= 2400000 msec).
        at __randomizedtesting.SeedInfo.seed([92C399F2076DFC1A]:0)

tlfeng · 2022-07-13T03:42:36Z

./gradlew check ran successfully in my local machine.

github-actions · 2022-07-13T03:47:22Z

Gradle Check (Jenkins) Run Completed with:

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

tlfeng · 2022-07-13T22:02:09Z

@owaiskazi19 Thanks for your review!

…ckMasterServiceOnMaster and BusyMasterServiceDisruption Signed-off-by: Tianli Feng <ftianli@amazon.com>

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

github-actions · 2022-07-14T22:00:38Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/648/
CommitID: 4b324e5

github-actions · 2022-07-14T22:06:27Z

Gradle Check (Jenkins) Run Completed with:

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

tlfeng · 2022-07-14T22:06:36Z

In Build 648:

* What went wrong:
Execution failed for task ':distribution:bwc:maintenance:buildBwcLinuxTar'.
> Building 1.3.4 didn't generate expected file /var/jenkins/workspace/gradle-check/search/distribution/bwc/maintenance/build/bwc/checkout-1.3/distribution/archives/linux-tar/build/distributions/opensearch-min-1.3.4-SNAPSHOT-linux-x64.tar.gz

It must caused by version 1.3.5 is not added into bwcVersions file of 2.x branch. The code will be like e724b2e

github-actions · 2022-07-14T22:26:29Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/642/
CommitID: 6030c53

opensearch-trigger-bot bot requested review from a team and reta as code owners July 12, 2022 21:44

tlfeng added enhancement Enhancement or improvement to existing feature or request backport PRs or issues specific to backporting features or enhancments v2.2.0 labels Jul 12, 2022

reta approved these changes Jul 12, 2022

View reviewed changes

Restore some classpath that removed during renaming refactor

c864668

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

Correct a mistake in last commit caused compile error

ef3a98a

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

tlfeng mentioned this pull request Jul 13, 2022

Deprecate public class names with master terminology #3871

Merged

5 tasks

owaiskazi19 approved these changes Jul 13, 2022

View reviewed changes

Tianli Feng added 3 commits July 14, 2022 14:28

Revert renaming class MasterService, FakeThreadPoolMasterService, Blo…

c4ed72f

…ckMasterServiceOnMaster and BusyMasterServiceDisruption Signed-off-by: Tianli Feng <ftianli@amazon.com>

Revert renaming some variable name of MasterService

6030c53

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

Revert renaming some variable name of MasterService

4b324e5

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

tlfeng merged commit 6346447 into 2.x Jul 14, 2022

tlfeng deleted the backport/backport-3619-to-2.x branch July 14, 2022 23:38

tlfeng mentioned this pull request Jul 19, 2022

Deprecate public or protected class that contains "master" terminology in 'server' and 'test/framework' directory #3543

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Backport 2.x] Rename public classes with 'Master' to 'ClusterManager' #3870

[Backport 2.x] Rename public classes with 'Master' to 'ClusterManager' #3870

opensearch-trigger-bot bot commented Jul 12, 2022 •

edited by tlfeng

Loading

github-actions bot commented Jul 12, 2022

tlfeng commented Jul 12, 2022 •

edited

Loading

github-actions bot commented Jul 12, 2022

codecov-commenter commented Jul 12, 2022 •

edited

Loading

tlfeng commented Jul 12, 2022

github-actions bot commented Jul 12, 2022

github-actions bot commented Jul 13, 2022

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

tlfeng commented Jul 13, 2022

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 14, 2022

github-actions bot commented Jul 14, 2022

tlfeng commented Jul 14, 2022 •

edited

Loading

github-actions bot commented Jul 14, 2022

[Backport 2.x] Rename public classes with 'Master' to 'ClusterManager' #3870

[Backport 2.x] Rename public classes with 'Master' to 'ClusterManager' #3870

Conversation

opensearch-trigger-bot bot commented Jul 12, 2022 • edited by tlfeng Loading

github-actions bot commented Jul 12, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 12, 2022 • edited Loading

github-actions bot commented Jul 12, 2022

Gradle Check (Jenkins) Run Completed with:

codecov-commenter commented Jul 12, 2022 • edited Loading

Codecov Report

tlfeng commented Jul 12, 2022

github-actions bot commented Jul 12, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jul 13, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 13, 2022

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 13, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 13, 2022

github-actions bot commented Jul 14, 2022

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Jul 14, 2022

Gradle Check (Jenkins) Run Completed with:

tlfeng commented Jul 14, 2022 • edited Loading

github-actions bot commented Jul 14, 2022

Gradle Check (Jenkins) Run Completed with:

opensearch-trigger-bot bot commented Jul 12, 2022 •

edited by tlfeng

Loading

tlfeng commented Jul 12, 2022 •

edited

Loading

codecov-commenter commented Jul 12, 2022 •

edited

Loading

tlfeng commented Jul 14, 2022 •

edited

Loading