Remove more deprecated master classes (#17166)

Signed-off-by: Andrew Ross <[email protected]>
opensearch-project · Jan 28, 2025 · 1ca338d · 1ca338d
1 parent c5ab162
commit 1ca338d
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 451 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteRestoreSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteRestoreSnapshotIT.java
@@ -1143,7 +1143,7 @@ public void testConcurrentSnapshotV2CreateOperation_MasterChange() throws Except
                     .cluster()
                     .prepareCreateSnapshot(snapshotRepoName, snapshotName)
                     .setWaitForCompletion(true)
-                    .setMasterNodeTimeout(TimeValue.timeValueSeconds(60))
+                    .setClusterManagerNodeTimeout(TimeValue.timeValueSeconds(60))
                     .get();
 
             } catch (Exception ignored) {}

diff --git a/...g/opensearch/action/support/clustermanager/ClusterManagerNodeOperationRequestBuilder.java b/...g/opensearch/action/support/clustermanager/ClusterManagerNodeOperationRequestBuilder.java
@@ -63,17 +63,6 @@ public final RequestBuilder setClusterManagerNodeTimeout(TimeValue timeout) {
         return (RequestBuilder) this;
     }
 
-    /**
-     * Sets the cluster-manager node timeout in case the cluster-manager has not yet been discovered.
-     *
-     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated
-    public final RequestBuilder setMasterNodeTimeout(TimeValue timeout) {
-        return setClusterManagerNodeTimeout(timeout);
-    }
-
     /**
      * Sets the cluster-manager node timeout in case the cluster-manager has not yet been discovered.
      */
@@ -82,15 +71,4 @@ public final RequestBuilder setClusterManagerNodeTimeout(String timeout) {
         request.clusterManagerNodeTimeout(timeout);
         return (RequestBuilder) this;
     }
-
-    /**
-     * Sets the cluster-manager node timeout in case the cluster-manager has not yet been discovered.
-     *
-     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated
-    public final RequestBuilder setMasterNodeTimeout(String timeout) {
-        return setClusterManagerNodeTimeout(timeout);
-    }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java b/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java
diff --git a/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java b/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java
diff --git a/server/src/main/java/org/opensearch/cluster/NotMasterException.java b/server/src/main/java/org/opensearch/cluster/NotMasterException.java
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java b/server/src/main/java/org/opensearch/cluster/coordination/NoMasterBlockService.java
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java
diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java
@@ -43,7 +43,6 @@
 import org.opensearch.cluster.ClusterStateObserver;
 import org.opensearch.cluster.ClusterStateTaskConfig;
 import org.opensearch.cluster.LocalNodeClusterManagerListener;
-import org.opensearch.cluster.LocalNodeMasterListener;
 import org.opensearch.cluster.NodeConnectionsService;
 import org.opensearch.cluster.TimeoutClusterStateListener;
 import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException;
@@ -308,15 +307,6 @@ public void addLocalNodeClusterManagerListener(LocalNodeClusterManagerListener l
         addListener(listener);
     }
 
-    /**
-     * Add a listener for on/off local node cluster-manager events
-     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #addLocalNodeClusterManagerListener}
-     */
-    @Deprecated
-    public void addLocalNodeMasterListener(LocalNodeMasterListener listener) {
-        addLocalNodeClusterManagerListener(listener);
-    }
-
     /**
      * Adds a cluster state listener that is expected to be removed during a short period of time.
      * If provided, the listener will be notified once a specific time has elapsed.