Skip to content

Commit 32a88eb

Browse files
authored
Remove MasterService class (#17151)
This has been deprecated and is replaced by ClusterManagerService. Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent 8ec93ae commit 32a88eb

16 files changed

+1087
-1396
lines changed

server/src/internalClusterTest/java/org/opensearch/clustermanager/ClusterManagerTaskThrottlingIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void onFailure(Exception e) {
8686

8787
assertEquals(totalRequest + throttledRequest.get(), requestCountOnClusterManager.get());
8888
assertBusy(
89-
() -> { assertEquals(clusterService().getMasterService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
89+
() -> { assertEquals(clusterService().getClusterManagerService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
9090
);
9191
} finally {
9292
clusterSettingCleanUp();

server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java

+988-3
Large diffs are not rendered by default.

server/src/main/java/org/opensearch/cluster/service/ClusterService.java

-22
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.opensearch.cluster.ClusterStateTaskExecutor;
4242
import org.opensearch.cluster.ClusterStateTaskListener;
4343
import org.opensearch.cluster.LocalNodeClusterManagerListener;
44-
import org.opensearch.cluster.LocalNodeMasterListener;
4544
import org.opensearch.cluster.NodeConnectionsService;
4645
import org.opensearch.cluster.node.DiscoveryNode;
4746
import org.opensearch.cluster.routing.OperationRouting;
@@ -247,25 +246,10 @@ public void addLocalNodeClusterManagerListener(LocalNodeClusterManagerListener l
247246
clusterApplierService.addLocalNodeClusterManagerListener(listener);
248247
}
249248

250-
/**
251-
* Add a listener for on/off local node cluster-manager events
252-
* @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #addLocalNodeClusterManagerListener}
253-
*/
254-
@Deprecated
255-
public void addLocalNodeMasterListener(LocalNodeMasterListener listener) {
256-
addLocalNodeClusterManagerListener(listener);
257-
}
258-
259249
public ClusterManagerService getClusterManagerService() {
260250
return clusterManagerService;
261251
}
262252

263-
/** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerService()} */
264-
@Deprecated
265-
public MasterService getMasterService() {
266-
return clusterManagerService;
267-
}
268-
269253
/**
270254
* Getter and Setter for IndexingPressureService, This method exposes IndexingPressureService stats to other plugins for usage.
271255
* Although Indexing Pressure instances can be accessed via Node and NodeService class but none of them are
@@ -291,12 +275,6 @@ public static boolean assertClusterOrClusterManagerStateThread() {
291275
return true;
292276
}
293277

294-
/** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #assertClusterOrClusterManagerStateThread} */
295-
@Deprecated
296-
public static boolean assertClusterOrMasterStateThread() {
297-
return assertClusterOrClusterManagerStateThread();
298-
}
299-
300278
public ClusterName getClusterName() {
301279
return clusterName;
302280
}

0 commit comments

Comments
 (0)