Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename classes with name 'MasterService' to 'ClusterManagerService' in directory 'test/framework' #4051

Merged

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Jul 30, 2022

Description

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

After the class MasterService has been deprecated and class ClusterManagerService has been created in #4022 / commit 740f75d, the classes in test/framework directory with name 'MasterService' can be deprecated and renamed.

  • Rename the following classes in test/framework directory:
FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption

In the following PR (#4058), I will add back the above 3 classes with the old name and deprecate them, to keep the backwards compatibility.

Issues Resolved

A part of issue #3543

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.

Tianli Feng added 3 commits July 29, 2022 20:53
…gerService

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

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

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng requested review from a team and reta as code owners July 30, 2022 04:05
@tlfeng tlfeng added enhancement Enhancement or improvement to existing feature or request backport PRs or issues specific to backporting features or enhancments v3.0.0 Issues and PRs related to version 3.0.0 v2.2.0 backport 2.x Backport to 2.x branch and removed backport PRs or issues specific to backporting features or enhancments labels Jul 30, 2022
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #4051 (156d949) into main (740f75d) will increase coverage by 0.13%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##               main    #4051      +/-   ##
============================================
+ Coverage     70.50%   70.64%   +0.13%     
- Complexity    56848    56944      +96     
============================================
  Files          4583     4583              
  Lines        273931   273931              
  Branches      40158    40158              
============================================
+ Hits         193146   193517     +371     
+ Misses        64561    64135     -426     
- Partials      16224    16279      +55     
Impacted Files Coverage Δ
...on/BlockClusterManagerServiceOnClusterManager.java 0.00% <0.00%> (ø)
...isruption/BusyClusterManagerServiceDisruption.java 0.00% <ø> (ø)
...ster/coordination/AbstractCoordinatorTestCase.java 93.58% <100.00%> (-0.13%) ⬇️
...r/service/FakeThreadPoolClusterManagerService.java 88.88% <100.00%> (ø)
...java/org/opensearch/client/indices/DataStream.java 0.00% <0.00%> (-76.09%) ⬇️
.../opensearch/client/indices/CloseIndexResponse.java 17.50% <0.00%> (-73.75%) ⬇️
.../admin/cluster/reroute/ClusterRerouteResponse.java 60.00% <0.00%> (-40.00%) ⬇️
...luster/routing/allocation/RoutingExplanations.java 62.06% <0.00%> (-37.94%) ⬇️
...java/org/opensearch/threadpool/ThreadPoolInfo.java 56.25% <0.00%> (-37.50%) ⬇️
.../java/org/opensearch/transport/TransportStats.java 39.13% <0.00%> (-32.61%) ⬇️
... and 481 more

Help us with your feedback. Take ten seconds to tell us how you rate us.

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jul 31, 2022

@dreamer-89 Thank you so much for your rapid review! 🏅

@tlfeng tlfeng merged commit bea5d1a into opensearch-project:main Aug 1, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 1, 2022
…n directory 'test/framework' (#4051)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

After the class MasterService has been deprecated and class ClusterManagerService has been created in #4022 / commit 740f75d, the classes in `test/framework` directory with name 'MasterService' can be deprecated and renamed.

- Rename the following classes in `test/framework` directory:

FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption

In the following commit, I will add back the above 3 classes with the old name and deprecate them, to keep the backwards compatibility.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit bea5d1a)
tlfeng pushed a commit that referenced this pull request Aug 1, 2022
…n directory 'test/framework' (#4051) (#4057)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

After the class MasterService has been deprecated and class ClusterManagerService has been created in #4022 / commit 740f75d, the classes in `test/framework` directory with name 'MasterService' can be deprecated and renamed.

- Rename the following classes in `test/framework` directory:

FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption

In the following commit, I will add back the above 3 classes with the old name and deprecate them, to keep the backwards compatibility.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit bea5d1a)

Co-authored-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng deleted the rename-masterservice-test-framework branch August 1, 2022 04:43
tlfeng pushed a commit that referenced this pull request Aug 1, 2022
…er and BusyMasterServiceDisruption (#4058)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

In a previous PR #4051, 3 classes in `test/framework` directory that contains `master` in the name were renamed:
```
FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption
```

This is a following commit to add back the classes with the old name to keep the backwards compatibility. The classes with the old name will be subclass of the classes with new name, so that maintaining one implementation can support the usage for two classes.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 1, 2022
…er and BusyMasterServiceDisruption (#4058)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

In a previous PR #4051, 3 classes in `test/framework` directory that contains `master` in the name were renamed:
```
FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption
```

This is a following commit to add back the classes with the old name to keep the backwards compatibility. The classes with the old name will be subclass of the classes with new name, so that maintaining one implementation can support the usage for two classes.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit cebeb8c)
tlfeng pushed a commit that referenced this pull request Aug 1, 2022
…er and BusyMasterServiceDisruption (#4058) (#4068)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

In a previous PR #4051 / commit bea5d1a, 3 classes in `test/framework` directory that contains `master` in the name were renamed:
```
FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption
```

This is a following commit to add back the classes with the old name to keep the backwards compatibility. The classes with the old name will be subclass of the classes with new name, so that maintaining one implementation can support the usage for two classes.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit cebeb8c)

Co-authored-by: Tianli Feng <ftianli@amazon.com>
pranikum pushed a commit to pranikum/OpenSearch that referenced this pull request Aug 2, 2022
…er and BusyMasterServiceDisruption (opensearch-project#4058)

To support inclusive language, the master terminology is going to be replaced by cluster manager in the code base.

In a previous PR opensearch-project#4051, 3 classes in `test/framework` directory that contains `master` in the name were renamed:
```
FakeThreadPoolMasterService -> FakeThreadPoolClusterManagerService
BlockMasterServiceOnMaster -> BlockClusterManagerServiceOnClusterManager
BusyMasterServiceDisruption -> BusyClusterManagerServiceDisruption
```

This is a following commit to add back the classes with the old name to keep the backwards compatibility. The classes with the old name will be subclass of the classes with new name, so that maintaining one implementation can support the usage for two classes.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch enhancement Enhancement or improvement to existing feature or request v2.2.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants