Remove MasterService class (opensearch-project#17151)

This has been deprecated and is replaced by ClusterManagerService. Signed-off-by: Andrew Ross <[email protected]>
andrross · Jan 28, 2025 · 32a88eb · 32a88eb
1 parent 8ec93ae
commit 32a88eb
Show file tree

Hide file tree

Showing 16 changed files with 1,087 additions and 1,396 deletions.
diff --git a/...nternalClusterTest/java/org/opensearch/clustermanager/ClusterManagerTaskThrottlingIT.java b/...nternalClusterTest/java/org/opensearch/clustermanager/ClusterManagerTaskThrottlingIT.java
@@ -86,7 +86,7 @@ public void onFailure(Exception e) {
 
             assertEquals(totalRequest + throttledRequest.get(), requestCountOnClusterManager.get());
             assertBusy(
-                () -> { assertEquals(clusterService().getMasterService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
+                () -> { assertEquals(clusterService().getClusterManagerService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
             );
         } finally {
             clusterSettingCleanUp();

diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterService.java
@@ -41,7 +41,6 @@
 import org.opensearch.cluster.ClusterStateTaskExecutor;
 import org.opensearch.cluster.ClusterStateTaskListener;
 import org.opensearch.cluster.LocalNodeClusterManagerListener;
-import org.opensearch.cluster.LocalNodeMasterListener;
 import org.opensearch.cluster.NodeConnectionsService;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.OperationRouting;
@@ -247,25 +246,10 @@ public void addLocalNodeClusterManagerListener(LocalNodeClusterManagerListener l
         clusterApplierService.addLocalNodeClusterManagerListener(listener);
     }
 
-    /**
-     * Add a listener for on/off local node cluster-manager events
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #addLocalNodeClusterManagerListener}
-     */
-    @Deprecated
-    public void addLocalNodeMasterListener(LocalNodeMasterListener listener) {
-        addLocalNodeClusterManagerListener(listener);
-    }
-
     public ClusterManagerService getClusterManagerService() {
         return clusterManagerService;
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerService()} */
-    @Deprecated
-    public MasterService getMasterService() {
-        return clusterManagerService;
-    }
-
     /**
      * Getter and Setter for IndexingPressureService, This method exposes IndexingPressureService stats to other plugins for usage.
      * 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() {
         return true;
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #assertClusterOrClusterManagerStateThread} */
-    @Deprecated
-    public static boolean assertClusterOrMasterStateThread() {
-        return assertClusterOrClusterManagerStateThread();
-    }
-
     public ClusterName getClusterName() {
         return clusterName;
     }