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

[Backport 2.x] Rename classes with name 'MasterService' to 'ClusterManagerService' in directory 'test/framework' #4057

Merged
merged 1 commit into from
Aug 1, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

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

Backport bea5d1a from #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 PR, I will add back the above 3 classes with the old name and deprecate them, to keep the backwards compatibility.

…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)
@opensearch-trigger-bot opensearch-trigger-bot bot requested review from a team and reta as code owners August 1, 2022 03:49
@tlfeng 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 Aug 1, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 1, 2022

Gradle Check (Jenkins) Run Completed with:

@tlfeng tlfeng merged commit bb353b6 into 2.x Aug 1, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #4057 (83f5ca9) into 2.x (3f47160) will increase coverage by 0.03%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##                2.x    #4057      +/-   ##
============================================
+ Coverage     70.52%   70.55%   +0.03%     
- Complexity    56524    56557      +33     
============================================
  Files          4533     4533              
  Lines        272158   272158              
  Branches      40003    40003              
============================================
+ Hits         191936   192033      +97     
+ Misses        64101    63939     -162     
- Partials      16121    16186      +65     
Impacted Files Coverage Δ
...on/BlockClusterManagerServiceOnClusterManager.java 0.00% <0.00%> (ø)
...isruption/BusyClusterManagerServiceDisruption.java 0.00% <ø> (ø)
...ster/coordination/AbstractCoordinatorTestCase.java 91.52% <100.00%> (+0.25%) ⬆️
...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%) ⬇️
...a/org/opensearch/client/cluster/SniffModeInfo.java 0.00% <0.00%> (-56.25%) ⬇️
...pensearch/indices/breaker/CircuitBreakerStats.java 27.77% <0.00%> (-41.67%) ⬇️
...pensearch/action/ingest/DeletePipelineRequest.java 31.25% <0.00%> (-37.50%) ⬇️
.../java/org/opensearch/index/reindex/RemoteInfo.java 50.45% <0.00%> (-28.45%) ⬇️
... and 473 more

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments enhancement Enhancement or improvement to existing feature or request v2.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants