diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java index 3546776fa3617..25242b5ef798e 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java @@ -946,14 +946,6 @@ Params withFields(String[] fields) { return this; } - /** - * @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #withClusterManagerTimeout(TimeValue)} - */ - @Deprecated - Params withMasterTimeout(TimeValue clusterManagerTimeout) { - return putParam("master_timeout", clusterManagerTimeout); - } - Params withClusterManagerTimeout(TimeValue clusterManagerTimeout) { return putParam("cluster_manager_timeout", clusterManagerTimeout); } diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java index d40445b2daa81..77c004341c1c3 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java @@ -45,9 +45,6 @@ public abstract class TimedRequest implements Validatable { public static final TimeValue DEFAULT_ACK_TIMEOUT = timeValueSeconds(30); public static final TimeValue DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30); - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT} */ - @Deprecated - public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; private TimeValue timeout = DEFAULT_ACK_TIMEOUT; private TimeValue clusterManagerTimeout = DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; @@ -68,16 +65,6 @@ public void setClusterManagerTimeout(TimeValue clusterManagerTimeout) { this.clusterManagerTimeout = clusterManagerTimeout; } - /** - * Sets the timeout to connect to the cluster-manager node - * @param clusterManagerTimeout timeout as a {@link TimeValue} - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerTimeout(TimeValue)} - */ - @Deprecated - public void setMasterTimeout(TimeValue clusterManagerTimeout) { - setClusterManagerTimeout(clusterManagerTimeout); - } - /** * Returns the request timeout */ @@ -91,13 +78,4 @@ public TimeValue timeout() { public TimeValue clusterManagerNodeTimeout() { return clusterManagerTimeout; } - - /** - * Returns the timeout for the request to be completed on the cluster-manager node - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout()} - */ - @Deprecated - public TimeValue masterNodeTimeout() { - return clusterManagerNodeTimeout(); - } } diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java index 6326e8edf763b..c4117bbee677d 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java @@ -71,25 +71,10 @@ public TimeValue getClusterManagerNodeTimeout() { return clusterManagerNodeTimeout; } - /** - * @return the timeout for waiting for the cluster-manager node to respond - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()} - */ - @Deprecated - public TimeValue getMasterNodeTimeout() { - return getClusterManagerNodeTimeout(); - } - public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { this.clusterManagerNodeTimeout = clusterManagerNodeTimeout; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */ - @Deprecated - public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { final TimeValue timeValue = TimeValue.parseTimeValue( clusterManagerNodeTimeout, @@ -98,12 +83,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { setClusterManagerNodeTimeout(timeValue); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */ - @Deprecated - public void setMasterNodeTimeout(String clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - /** * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise */ diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java index 73f6f15fc7a78..20d0b964549bc 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java @@ -71,25 +71,10 @@ public TimeValue getClusterManagerNodeTimeout() { return clusterManagerNodeTimeout; } - /** - * @return the timeout for waiting for the cluster-manager node to respond - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()} - */ - @Deprecated - public TimeValue getMasterNodeTimeout() { - return getClusterManagerNodeTimeout(); - } - public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { this.clusterManagerNodeTimeout = clusterManagerNodeTimeout; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */ - @Deprecated - public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { final TimeValue timeValue = TimeValue.parseTimeValue( clusterManagerNodeTimeout, @@ -98,12 +83,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { setClusterManagerNodeTimeout(timeValue); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */ - @Deprecated - public void setMasterNodeTimeout(String clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - /** * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise */ diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java index dc1759a7272e8..4368fd0248b6d 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java @@ -90,25 +90,10 @@ public TimeValue getClusterManagerNodeTimeout() { return clusterManagerNodeTimeout; } - /** - * @return the timeout for waiting for the cluster-manager node to respond - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()} - */ - @Deprecated - public TimeValue getMasterNodeTimeout() { - return getClusterManagerNodeTimeout(); - } - public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { this.clusterManagerNodeTimeout = clusterManagerNodeTimeout; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */ - @Deprecated - public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { final TimeValue timeValue = TimeValue.parseTimeValue( clusterManagerNodeTimeout, @@ -117,12 +102,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) { setClusterManagerNodeTimeout(timeValue); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */ - @Deprecated - public void setMasterNodeTimeout(String clusterManagerNodeTimeout) { - setClusterManagerNodeTimeout(clusterManagerNodeTimeout); - } - /** * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise */ diff --git a/client/rest/src/main/java/org/opensearch/client/Node.java b/client/rest/src/main/java/org/opensearch/client/Node.java index 8fe5dcfa00db0..022e6476d8482 100644 --- a/client/rest/src/main/java/org/opensearch/client/Node.java +++ b/client/rest/src/main/java/org/opensearch/client/Node.java @@ -226,15 +226,6 @@ public boolean isClusterManagerEligible() { return roles.contains("master") || roles.contains("cluster_manager"); } - /** - * Returns whether or not the node could be elected cluster-manager. - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isClusterManagerEligible()} - */ - @Deprecated - public boolean isMasterEligible() { - return isClusterManagerEligible(); - } - /** * Returns whether or not the node stores data. */ diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/RepositoriesIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/RepositoriesIT.java index 35fd716c89e2b..bf69cf13adb52 100644 --- a/server/src/internalClusterTest/java/org/opensearch/snapshots/RepositoriesIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/RepositoriesIT.java @@ -433,7 +433,7 @@ public void testSnapshotShardBlobDeletionRepositoryThrowingError() throws Except createFullSnapshot(repositoryName, secondSnapshot); // Make repository to throw exception when trying to delete stale snapshot shard blobs - String clusterManagerNode = internalCluster().getMasterName(); + String clusterManagerNode = internalCluster().getClusterManagerName(); ((MockRepository) internalCluster().getInstance(RepositoriesService.class, clusterManagerNode).repository("test-repo")) .setThrowExceptionWhileDelete(true); diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java index 2dcfb58c3d7b8..f0e897458746c 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java @@ -367,12 +367,6 @@ public boolean hasDiscoveredClusterManager() { return clusterStateHealth.hasDiscoveredClusterManager(); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #hasDiscoveredClusterManager()} */ - @Deprecated - public boolean hasDiscoveredMaster() { - return hasDiscoveredClusterManager(); - } - public int getNumberOfPendingTasks() { return this.numberOfPendingTasks; } diff --git a/server/src/main/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeAction.java b/server/src/main/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeAction.java index 558b7370749d5..8e4d1e33b9a10 100644 --- a/server/src/main/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeAction.java +++ b/server/src/main/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeAction.java @@ -161,35 +161,16 @@ protected TransportClusterManagerNodeAction( protected abstract Response read(StreamInput in) throws IOException; - /** - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(ClusterManagerNodeRequest, ClusterState, ActionListener)} - */ - @Deprecated - protected void masterOperation(Request request, ClusterState state, ActionListener listener) throws Exception { - throw new UnsupportedOperationException("Must be overridden"); - } - // TODO: Add abstract keyword after removing the deprecated masterOperation() - protected void clusterManagerOperation(Request request, ClusterState state, ActionListener listener) throws Exception { - masterOperation(request, state, listener); - } + protected abstract void clusterManagerOperation(Request request, ClusterState state, ActionListener listener) + throws Exception; /** * Override this operation if access to the task parameter is needed - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(Task, ClusterManagerNodeRequest, ClusterState, ActionListener)} */ - @Deprecated - protected void masterOperation(Task task, Request request, ClusterState state, ActionListener listener) throws Exception { - clusterManagerOperation(request, state, listener); - } - - /** - * Override this operation if access to the task parameter is needed - */ - // TODO: Change the implementation to call 'clusterManagerOperation(request...)' after removing the deprecated masterOperation() protected void clusterManagerOperation(Task task, Request request, ClusterState state, ActionListener listener) throws Exception { - masterOperation(task, request, state, listener); + clusterManagerOperation(request, state, listener); } protected boolean localExecute(Request request) { @@ -265,7 +246,7 @@ public boolean shouldRetry(Exception e) { */ @Override public Exception getTimeoutException(Exception e) { - return new ProcessClusterEventTimeoutException(request.masterNodeTimeout, actionName); + return new ProcessClusterEventTimeoutException(request.clusterManagerNodeTimeout, actionName); } protected void doStart(ClusterState clusterState) { @@ -551,17 +532,6 @@ protected String getClusterManagerActionName(DiscoveryNode node) { return actionName; } - /** - * Allows to conditionally return a different cluster-manager node action name in the case an action gets renamed. - * This mainly for backwards compatibility should be used rarely - * - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #getClusterManagerActionName(DiscoveryNode)} - */ - @Deprecated - protected String getMasterActionName(DiscoveryNode node) { - return getClusterManagerActionName(node); - } - /** * Override to true if the transport action can be executed locally and need NOT be executed always on cluster-manager (Read actions). * The action is executed locally if this method returns true AND diff --git a/server/src/main/java/org/opensearch/action/support/clustermanager/info/TransportClusterInfoAction.java b/server/src/main/java/org/opensearch/action/support/clustermanager/info/TransportClusterInfoAction.java index 8a0082ad05f66..883d2e7429e2d 100644 --- a/server/src/main/java/org/opensearch/action/support/clustermanager/info/TransportClusterInfoAction.java +++ b/server/src/main/java/org/opensearch/action/support/clustermanager/info/TransportClusterInfoAction.java @@ -77,34 +77,16 @@ protected ClusterBlockException checkBlock(Request request, ClusterState state) .indicesBlockedException(ClusterBlockLevel.METADATA_READ, indexNameExpressionResolver.concreteIndexNames(state, request)); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(ClusterInfoRequest, ClusterState, ActionListener)} */ - @Deprecated - protected final void masterOperation(final Request request, final ClusterState state, final ActionListener listener) { - clusterManagerOperation(request, state, listener); - } - @Override protected final void clusterManagerOperation(final Request request, final ClusterState state, final ActionListener listener) { String[] concreteIndices = indexNameExpressionResolver.concreteIndexNames(state, request); doClusterManagerOperation(request, concreteIndices, state, listener); } - // TODO: Add abstract keyword after removing the deprecated doMasterOperation() - protected void doClusterManagerOperation( + protected abstract void doClusterManagerOperation( Request request, String[] concreteIndices, ClusterState state, ActionListener listener - ) { - doMasterOperation(request, concreteIndices, state, listener); - } - - /** - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #doClusterManagerOperation(ClusterInfoRequest, String[], ClusterState, ActionListener)} - */ - @Deprecated - protected void doMasterOperation(Request request, String[] concreteIndices, ClusterState state, ActionListener listener) { - throw new UnsupportedOperationException("Must be overridden"); - } - + ); } diff --git a/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java b/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java index 904083e96032f..45d9d6cf255d6 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java @@ -216,16 +216,6 @@ public boolean localNodeClusterManager() { return state.nodes().isLocalNodeElectedClusterManager(); } - /** - * Returns true iff the local node is the mater node of the cluster. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #localNodeClusterManager()} - */ - @Deprecated - public boolean localNodeMaster() { - return localNodeClusterManager(); - } - /** * Returns the {@link org.opensearch.cluster.node.DiscoveryNodes.Delta} between * the previous cluster state and the new cluster state. diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java index 115816798959e..55351a2a998ec 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java @@ -59,16 +59,6 @@ default boolean runOnlyOnClusterManager() { return true; } - /** - * indicates whether this executor should only run if the current node is cluster-manager - * - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #runOnlyOnClusterManager()} - */ - @Deprecated - default boolean runOnlyOnMaster() { - return runOnlyOnClusterManager(); - } - /** * Callback invoked after new cluster state is published. Note that * this method is not invoked if the cluster state was not updated. diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java index 0cb24bd3f3eab..db81bcd3146fc 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskListener.java @@ -57,17 +57,6 @@ default void onNoLongerClusterManager(String source) { onFailure(source, new NotClusterManagerException("no longer cluster-manager. source: [" + source + "]")); } - /** - * called when the task was rejected because the local node is no longer cluster-manager. - * Used only for tasks submitted to {@link ClusterManagerService}. - * - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #onNoLongerClusterManager(String)} - */ - @Deprecated - default void onNoLongerMaster(String source) { - onNoLongerClusterManager(source); - } - /** * Called when the result of the {@link ClusterStateTaskExecutor#execute(ClusterState, List)} have been processed * properly by all listeners. diff --git a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java index 0b569901d0da1..91be118460912 100644 --- a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java +++ b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java @@ -131,19 +131,6 @@ public void updateMappingOnClusterManager(Index index, Mapping mappingUpdate, Ac } } - /** - * Update mappings on the cluster-manager node, waiting for the change to be committed, - * but not for the mapping update to be applied on all nodes. The timeout specified by - * {@code timeout} is the cluster-manager node timeout ({@link ClusterManagerNodeRequest#clusterManagerNodeTimeout()}), - * potentially waiting for a cluster-manager node to be available. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #updateMappingOnClusterManager(Index, Mapping, ActionListener)} - */ - @Deprecated - public void updateMappingOnMaster(Index index, Mapping mappingUpdate, ActionListener listener) { - updateMappingOnClusterManager(index, mappingUpdate, listener); - } - // used by tests int blockedThreads() { return semaphore.getQueueLength(); diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java index ec30496a3f7ad..bf2545d059955 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java @@ -120,24 +120,13 @@ public String toString() { } public boolean isBecomeClusterManagerTask() { - return reason.equals(BECOME_MASTER_TASK_REASON) || reason.equals(BECOME_CLUSTER_MANAGER_TASK_REASON); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isBecomeClusterManagerTask()} */ - @Deprecated - public boolean isBecomeMasterTask() { - return isBecomeClusterManagerTask(); + return reason.equals(BECOME_CLUSTER_MANAGER_TASK_REASON); } public boolean isFinishElectionTask() { return reason.equals(FINISH_ELECTION_TASK_REASON); } - /** - * @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #BECOME_CLUSTER_MANAGER_TASK_REASON} - */ - @Deprecated - private static final String BECOME_MASTER_TASK_REASON = "_BECOME_MASTER_TASK_"; private static final String BECOME_CLUSTER_MANAGER_TASK_REASON = "_BECOME_CLUSTER_MANAGER_TASK_"; private static final String FINISH_ELECTION_TASK_REASON = "_FINISH_ELECTION_"; } @@ -379,16 +368,6 @@ public boolean runOnlyOnClusterManager() { return false; } - /** - * a task indicates that the current node should become master - * - * @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #newBecomeClusterManagerTask()} - */ - @Deprecated - public static Task newBecomeMasterTask() { - return new Task(null, Task.BECOME_MASTER_TASK_REASON); - } - /** * a task indicates that the current node should become cluster-manager */ diff --git a/server/src/main/java/org/opensearch/cluster/coordination/NoClusterManagerBlockService.java b/server/src/main/java/org/opensearch/cluster/coordination/NoClusterManagerBlockService.java index b377fe592b0f4..377ad68892441 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/NoClusterManagerBlockService.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/NoClusterManagerBlockService.java @@ -76,19 +76,6 @@ public class NoClusterManagerBlockService { EnumSet.of(ClusterBlockLevel.METADATA_WRITE) ); - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #NO_CLUSTER_MANAGER_BLOCK_ID} */ - @Deprecated - public static final int NO_MASTER_BLOCK_ID = NO_CLUSTER_MANAGER_BLOCK_ID; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #NO_CLUSTER_MANAGER_BLOCK_WRITES} */ - @Deprecated - public static final ClusterBlock NO_MASTER_BLOCK_WRITES = NO_CLUSTER_MANAGER_BLOCK_WRITES; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #NO_CLUSTER_MANAGER_BLOCK_ALL} */ - @Deprecated - public static final ClusterBlock NO_MASTER_BLOCK_ALL = NO_CLUSTER_MANAGER_BLOCK_ALL; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #NO_CLUSTER_MANAGER_BLOCK_METADATA_WRITES} */ - @Deprecated - public static final ClusterBlock NO_MASTER_BLOCK_METADATA_WRITES = NO_CLUSTER_MANAGER_BLOCK_METADATA_WRITES; - public static final Setting NO_MASTER_BLOCK_SETTING = new Setting<>( "cluster.no_master_block", "metadata_write", @@ -133,12 +120,6 @@ public ClusterBlock getNoClusterManagerBlock() { return noClusterManagerBlock; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getNoClusterManagerBlock()} */ - @Deprecated - public ClusterBlock getNoMasterBlock() { - return noClusterManagerBlock; - } - private void setNoClusterManagerBlock(ClusterBlock noClusterManagerBlock) { this.noClusterManagerBlock = noClusterManagerBlock; } diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PeersResponse.java b/server/src/main/java/org/opensearch/cluster/coordination/PeersResponse.java index 8a70c71d53fdd..f0712f69b255c 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/PeersResponse.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/PeersResponse.java @@ -80,15 +80,6 @@ public Optional getClusterManagerNode() { return clusterManagerNode; } - /** - * @return the node that is currently leading, according to the responding node. - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerNode()} - */ - @Deprecated - public Optional getMasterNode() { - return getClusterManagerNode(); - } - /** * @return the collection of known peers of the responding node, or an empty collection if the responding node believes there * is currently a leader. diff --git a/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java b/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java index f6cfdd3c42e0c..5eeac822e7c3e 100644 --- a/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java +++ b/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java @@ -331,12 +331,6 @@ public boolean hasDiscoveredClusterManager() { return hasDiscoveredClusterManager; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #hasDiscoveredClusterManager()} */ - @Deprecated - public boolean hasDiscoveredMaster() { - return hasDiscoveredClusterManager(); - } - @Override public Iterator iterator() { return indices.values().iterator(); diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java index 3af18470df787..5d20388b74e1f 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java @@ -1720,10 +1720,6 @@ public static class PutRequest { TimeValue clusterManagerTimeout = ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; - /** @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerTimeout} */ - @Deprecated - TimeValue masterTimeout = ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; - public PutRequest(String cause, String name) { this.cause = cause; this.name = name; @@ -1764,12 +1760,6 @@ public PutRequest clusterManagerTimeout(TimeValue clusterManagerTimeout) { return this; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerTimeout(TimeValue)} */ - @Deprecated - public PutRequest masterTimeout(TimeValue masterTimeout) { - return clusterManagerTimeout(masterTimeout); - } - public PutRequest version(Integer version) { this.version = version; return this; @@ -1802,10 +1792,6 @@ public static class RemoveRequest { final String name; TimeValue clusterManagerTimeout = ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; - /** @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerTimeout} */ - @Deprecated - TimeValue masterTimeout = ClusterManagerNodeRequest.DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT; - public RemoveRequest(String name) { this.name = name; } @@ -1814,12 +1800,6 @@ public RemoveRequest clusterManagerTimeout(TimeValue clusterManagerTimeout) { this.clusterManagerTimeout = clusterManagerTimeout; return this; } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerTimeout} */ - @Deprecated - public RemoveRequest masterTimeout(TimeValue masterTimeout) { - return clusterManagerTimeout(masterTimeout); - } } /** diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java index d84fb794c5e4f..12cdafdcdbf1b 100644 --- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java +++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java @@ -105,12 +105,6 @@ public static boolean isClusterManagerNode(Settings settings) { return hasRole(settings, DiscoveryNodeRole.MASTER_ROLE) || hasRole(settings, DiscoveryNodeRole.CLUSTER_MANAGER_ROLE); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isClusterManagerNode(Settings)} */ - @Deprecated - public static boolean isMasterNode(Settings settings) { - return isClusterManagerNode(settings); - } - /** * Due to the way that plugins may not be available when settings are being initialized, * not all roles may be available from a static/initializing context such as a {@link Setting} @@ -469,16 +463,6 @@ public boolean isClusterManagerNode() { return roles.contains(DiscoveryNodeRole.MASTER_ROLE) || roles.contains(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE); } - /** - * Can this node become cluster-manager or not. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isClusterManagerNode()} - */ - @Deprecated - public boolean isMasterNode() { - return isClusterManagerNode(); - } - /** * Returns a boolean that tells whether this an ingest node or not */ diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java index 52d830aafda38..b9169169703d4 100644 --- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java +++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java @@ -124,16 +124,6 @@ public boolean isLocalNodeElectedClusterManager() { return localNodeId.equals(clusterManagerNodeId); } - /** - * Returns {@code true} if the local node is the elected cluster-manager node. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isLocalNodeElectedClusterManager()} - */ - @Deprecated - public boolean isLocalNodeElectedMaster() { - return isLocalNodeElectedClusterManager(); - } - /** * Get the number of known nodes * @@ -170,17 +160,6 @@ public Map getClusterManagerNodes() { return this.clusterManagerNodes; } - /** - * Get a {@link Map} of the discovered cluster-manager nodes arranged by their ids - * - * @return {@link Map} of the discovered cluster-manager nodes arranged by their ids - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerNodes()} - */ - @Deprecated - public Map getMasterNodes() { - return getClusterManagerNodes(); - } - /** * @return All the ingest nodes arranged by their ids */ @@ -199,17 +178,6 @@ public Map getClusterManagerAndDataNodes() { return Collections.unmodifiableMap(nodes); } - /** - * Get a {@link Map} of the discovered cluster-manager and data nodes arranged by their ids - * - * @return {@link Map} of the discovered cluster-manager and data nodes arranged by their ids - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerAndDataNodes()} - */ - @Deprecated - public Map getMasterAndDataNodes() { - return getClusterManagerAndDataNodes(); - } - /** * Get a {@link Map} of the coordinating only nodes (nodes which are neither cluster-manager, nor data, nor ingest nodes) arranged by their ids * @@ -233,16 +201,6 @@ public Stream clusterManagersFirstStream() { ); } - /** - * Returns a stream of all nodes, with cluster-manager nodes at the front - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagersFirstStream()} - */ - @Deprecated - public Stream mastersFirstStream() { - return clusterManagersFirstStream(); - } - /** * Get a node by its id * @@ -292,17 +250,6 @@ public String getClusterManagerNodeId() { return this.clusterManagerNodeId; } - /** - * Get the id of the cluster-manager node - * - * @return id of the cluster-manager - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerNodeId()} - */ - @Deprecated - public String getMasterNodeId() { - return getClusterManagerNodeId(); - } - /** * Get the id of the local node * @@ -332,17 +279,6 @@ public DiscoveryNode getClusterManagerNode() { return null; } - /** - * Returns the cluster-manager node, or {@code null} if there is no cluster-manager node - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerNode()} - */ - @Deprecated - @Nullable - public DiscoveryNode getMasterNode() { - return getClusterManagerNode(); - } - /** * Get a node by its address * @@ -606,36 +542,16 @@ public boolean clusterManagerNodeChanged() { return Objects.equals(newClusterManagerNode, previousClusterManagerNode) == false; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNodeChanged()} */ - @Deprecated - public boolean masterNodeChanged() { - return clusterManagerNodeChanged(); - } - @Nullable public DiscoveryNode previousClusterManagerNode() { return previousClusterManagerNode; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #previousClusterManagerNode()} */ - @Deprecated - @Nullable - public DiscoveryNode previousMasterNode() { - return previousClusterManagerNode(); - } - @Nullable public DiscoveryNode newClusterManagerNode() { return newClusterManagerNode; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #newClusterManagerNode()} */ - @Deprecated - @Nullable - public DiscoveryNode newMasterNode() { - return newClusterManagerNode(); - } - public boolean removed() { return !removed.isEmpty(); } @@ -855,12 +771,6 @@ public Builder clusterManagerNodeId(String clusterManagerNodeId) { return this; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNodeId} */ - @Deprecated - public Builder masterNodeId(String clusterManagerNodeId) { - return clusterManagerNodeId(clusterManagerNodeId); - } - public Builder localNodeId(String localNodeId) { this.localNodeId = localNodeId; return this; @@ -939,12 +849,6 @@ public DiscoveryNodes build() { public boolean isLocalNodeElectedClusterManager() { return clusterManagerNodeId != null && clusterManagerNodeId.equals(localNodeId); } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isLocalNodeElectedClusterManager()} */ - @Deprecated - public boolean isLocalNodeElectedMaster() { - return isLocalNodeElectedClusterManager(); - } } /** diff --git a/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java b/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java index 2e200b6f38612..43368218e900c 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java +++ b/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java @@ -239,11 +239,4 @@ private synchronized void scheduleIfNeeded(long currentNanoTime, ClusterState st protected void assertClusterOrClusterManagerStateThread() { assert ClusterService.assertClusterOrClusterManagerStateThread(); } - - // protected so that it can be overridden (and disabled) by unit tests - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #assertClusterOrClusterManagerStateThread()} */ - @Deprecated - protected void assertClusterOrMasterStateThread() { - assertClusterOrClusterManagerStateThread(); - } } diff --git a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java index 57ade7fa10cd0..c0bb52b6b43bc 100644 --- a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java +++ b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java @@ -1586,22 +1586,6 @@ private boolean isReplicated( return true; } - /** - * Notifies the tracker of the current allocation IDs in the cluster state. - * @param applyingClusterStateVersion the cluster state version being applied when updating the allocation IDs from the cluster-manager - * @param inSyncAllocationIds the allocation IDs of the currently in-sync shard copies - * @param routingTable the shard routing table - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #updateFromClusterManager(long, Set, IndexShardRoutingTable)} - */ - @Deprecated - public synchronized void updateFromMaster( - final long applyingClusterStateVersion, - final Set inSyncAllocationIds, - final IndexShardRoutingTable routingTable - ) { - updateFromClusterManager(applyingClusterStateVersion, inSyncAllocationIds, routingTable); - } - /** * Called when the recovery process for a shard has opened the engine on the target shard. Ensures that the right data structures * have been set up locally to track local checkpoint information for the shard and that the shard is added to the replication group. diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreRemoteStoreAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreRemoteStoreAction.java index 414c82b4a470f..e4c70ca28e2b4 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreRemoteStoreAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreRemoteStoreAction.java @@ -40,8 +40,8 @@ public String getName() { @Override public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { RestoreRemoteStoreRequest restoreRemoteStoreRequest = new RestoreRemoteStoreRequest(); - restoreRemoteStoreRequest.masterNodeTimeout( - request.paramAsTime("cluster_manager_timeout", restoreRemoteStoreRequest.masterNodeTimeout()) + restoreRemoteStoreRequest.clusterManagerNodeTimeout( + request.paramAsTime("cluster_manager_timeout", restoreRemoteStoreRequest.clusterManagerNodeTimeout()) ); restoreRemoteStoreRequest.waitForCompletion(request.paramAsBoolean("wait_for_completion", false)); restoreRemoteStoreRequest.restoreAllShards(request.paramAsBoolean("restore_all_shards", false)); diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequestTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequestTests.java index 7fff55f1d1259..4a9c8b1bc031d 100644 --- a/server/src/test/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequestTests.java +++ b/server/src/test/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequestTests.java @@ -41,7 +41,7 @@ private RestoreRemoteStoreRequest randomState(RestoreRemoteStoreRequest instance instance.restoreAllShards(randomBoolean()); if (randomBoolean()) { - instance.masterNodeTimeout(randomTimeValue()); + instance.clusterManagerNodeTimeout(randomTimeValue()); } return instance; @@ -75,7 +75,7 @@ public void testSource() throws IOException { Map map = parser.mapOrdered(); RestoreRemoteStoreRequest processed = new RestoreRemoteStoreRequest(); - processed.masterNodeTimeout(original.masterNodeTimeout()); + processed.clusterManagerNodeTimeout(original.clusterManagerNodeTimeout()); processed.waitForCompletion(original.waitForCompletion()); processed.restoreAllShards(original.restoreAllShards()); processed.source(map); diff --git a/server/src/test/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java b/server/src/test/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java index 00198364fc8d7..5075f64937508 100644 --- a/server/src/test/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java +++ b/server/src/test/java/org/opensearch/action/support/clustermanager/TransportClusterManagerNodeActionTests.java @@ -328,7 +328,7 @@ public void testDeprecatedMasterOperationWithTaskParameterCanBeCalled() throws E new Action("internal:testAction", transportService, clusterService, threadPool) { @Override - protected void masterOperation(Task task, Request request, ClusterState state, ActionListener listener) { + protected void clusterManagerOperation(Task task, Request request, ClusterState state, ActionListener listener) { if (clusterManagerOperationFailure) { listener.onFailure(exception); } else { @@ -656,7 +656,7 @@ public void testThrottlingRetryLocalMaster() throws InterruptedException, Broken TransportClusterManagerNodeAction action = new Action("internal:testAction", transportService, clusterService, threadPool) { @Override - protected void masterOperation(Task task, Request request, ClusterState state, ActionListener listener) { + protected void clusterManagerOperation(Task task, Request request, ClusterState state, ActionListener listener) { if (exception.getAndSet(false)) { throw new ClusterManagerThrottlingException("Throttling Exception : Limit exceeded for test"); } else { @@ -693,7 +693,7 @@ public void testThrottlingRetryRemoteMaster() throws ExecutionException, Interru CapturingTransport.CapturedRequest[] capturedRequests = transport.getCapturedRequestsAndClear(); assertThat(capturedRequests.length, equalTo(1)); CapturingTransport.CapturedRequest capturedRequest = capturedRequests[0]; - assertTrue(capturedRequest.node.isMasterNode()); + assertTrue(capturedRequest.node.isClusterManagerNode()); assertThat(capturedRequest.request, equalTo(request)); assertThat(capturedRequest.action, equalTo("internal:testAction")); transport.handleRemoteError( @@ -727,7 +727,7 @@ public void testRetryForDifferentException() throws InterruptedException, Broken TransportClusterManagerNodeAction action = new Action("internal:testAction", transportService, clusterService, threadPool) { @Override - protected void masterOperation(Task task, Request request, ClusterState state, ActionListener listener) + protected void clusterManagerOperation(Task task, Request request, ClusterState state, ActionListener listener) throws Exception { if (exception.getAndSet(false)) { throw new Exception("Different exception"); diff --git a/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java index 9590e5615d451..9b91e4d507d57 100644 --- a/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java @@ -252,8 +252,6 @@ public void testUpdatesNodeWithNewRoles() throws Exception { * Validate isBecomeClusterManagerTask() can identify "become cluster manager task" properly */ public void testIsBecomeClusterManagerTask() { - JoinTaskExecutor.Task joinTaskOfMaster = JoinTaskExecutor.newBecomeMasterTask(); - assertThat(joinTaskOfMaster.isBecomeClusterManagerTask(), is(true)); JoinTaskExecutor.Task joinTaskOfClusterManager = JoinTaskExecutor.newBecomeClusterManagerTask(); assertThat(joinTaskOfClusterManager.isBecomeClusterManagerTask(), is(true)); } diff --git a/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java b/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java index a1c914c69ce21..cee814b227534 100644 --- a/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java @@ -779,7 +779,7 @@ public void testConcurrentJoining() { throw new RuntimeException(e); } - assertTrue(ClusterManagerServiceTests.discoveryState(clusterManagerService).nodes().isLocalNodeElectedMaster()); + assertTrue(ClusterManagerServiceTests.discoveryState(clusterManagerService).nodes().isLocalNodeElectedClusterManager()); for (DiscoveryNode successfulNode : successfulNodes) { assertTrue(successfulNode + " joined cluster", clusterStateHasNode(successfulNode)); assertFalse(successfulNode + " voted for cluster-manager", coordinator.missingJoinVoteFrom(successfulNode)); @@ -863,7 +863,7 @@ public void testJoinFailsWhenDecommissioned() { } private boolean isLocalNodeElectedMaster() { - return ClusterManagerServiceTests.discoveryState(clusterManagerService).nodes().isLocalNodeElectedMaster(); + return ClusterManagerServiceTests.discoveryState(clusterManagerService).nodes().isLocalNodeElectedClusterManager(); } private boolean clusterStateHasNode(DiscoveryNode node) { diff --git a/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java index b97656304c46f..b51cc26053651 100644 --- a/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java @@ -399,13 +399,13 @@ public void offClusterManager() { ClusterState state = timedClusterApplierService.state(); DiscoveryNodes nodes = state.nodes(); - DiscoveryNodes.Builder nodesBuilder = DiscoveryNodes.builder(nodes).masterNodeId(nodes.getLocalNodeId()); + DiscoveryNodes.Builder nodesBuilder = DiscoveryNodes.builder(nodes).clusterManagerNodeId(nodes.getLocalNodeId()); state = ClusterState.builder(state).nodes(nodesBuilder).build(); setState(timedClusterApplierService, state); assertThat(isClusterManager.get(), is(true)); nodes = state.nodes(); - nodesBuilder = DiscoveryNodes.builder(nodes).masterNodeId(null); + nodesBuilder = DiscoveryNodes.builder(nodes).clusterManagerNodeId(null); state = ClusterState.builder(state).nodes(nodesBuilder).build(); setState(timedClusterApplierService, state); assertThat(isClusterManager.get(), is(false)); diff --git a/server/src/test/java/org/opensearch/cluster/service/ClusterManagerServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterManagerServiceTests.java index d1b06d24cc797..d9e6b2d90cfca 100644 --- a/server/src/test/java/org/opensearch/cluster/service/ClusterManagerServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/ClusterManagerServiceTests.java @@ -1288,7 +1288,7 @@ public void testLongClusterStateUpdateLogging() throws Exception { final ClusterState initialClusterState = ClusterState.builder( new ClusterName(ClusterManagerServiceTests.class.getSimpleName()) ) - .nodes(DiscoveryNodes.builder().add(localNode).localNodeId(localNode.getId()).masterNodeId(localNode.getId())) + .nodes(DiscoveryNodes.builder().add(localNode).localNodeId(localNode.getId()).clusterManagerNodeId(localNode.getId())) .blocks(ClusterBlocks.EMPTY_CLUSTER_BLOCK) .build(); final AtomicReference clusterStateRef = new AtomicReference<>(initialClusterState); @@ -1460,7 +1460,7 @@ public void testLongClusterStateUpdateLoggingForFailedPublication() throws Excep final ClusterState initialClusterState = ClusterState.builder( new ClusterName(ClusterManagerServiceTests.class.getSimpleName()) ) - .nodes(DiscoveryNodes.builder().add(localNode).localNodeId(localNode.getId()).masterNodeId(localNode.getId())) + .nodes(DiscoveryNodes.builder().add(localNode).localNodeId(localNode.getId()).clusterManagerNodeId(localNode.getId())) .blocks(ClusterBlocks.EMPTY_CLUSTER_BLOCK) .build(); final AtomicReference clusterStateRef = new AtomicReference<>(initialClusterState); @@ -1543,7 +1543,9 @@ public void testAcking() throws InterruptedException { ) { final ClusterState initialClusterState = ClusterState.builder(new ClusterName(ClusterManagerServiceTests.class.getSimpleName())) - .nodes(DiscoveryNodes.builder().add(node1).add(node2).add(node3).localNodeId(node1.getId()).masterNodeId(node1.getId())) + .nodes( + DiscoveryNodes.builder().add(node1).add(node2).add(node3).localNodeId(node1.getId()).clusterManagerNodeId(node1.getId()) + ) .blocks(ClusterBlocks.EMPTY_CLUSTER_BLOCK) .build(); final AtomicReference publisherRef = new AtomicReference<>(); diff --git a/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java index c536ce2597fd7..9ad42554a8404 100644 --- a/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java @@ -591,11 +591,6 @@ public ClusterTasksResult execute( return null; } - @Override - public boolean runOnlyOnMaster() { - return true; - } - @Override public void clusterStatePublished(ClusterChangedEvent clusterChangedEvent) {} diff --git a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java index e271a0bc8ffa3..63758cb44dc5a 100644 --- a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java @@ -443,12 +443,6 @@ public ClusterState joinNodesAndBecomeClusterManager(ClusterState clusterState, return runTasks(joinTaskExecutor, clusterState, joinNodes); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #joinNodesAndBecomeClusterManager(ClusterState, List)} */ - @Deprecated - public ClusterState joinNodesAndBecomeMaster(ClusterState clusterState, List nodes) { - return joinNodesAndBecomeClusterManager(clusterState, nodes); - } - public ClusterState removeNodes(ClusterState clusterState, List nodes) { return runTasks( nodeRemovalExecutor, diff --git a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java index d153e8d6aef53..02b5164e3d822 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -295,30 +295,6 @@ public static String blockClusterManagerFromFinalizingSnapshotOnSnapFile(final S return clusterManagerName; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #blockClusterManagerFromFinalizingSnapshotOnIndexFile(String)} */ - @Deprecated - public static String blockMasterFromFinalizingSnapshotOnIndexFile(final String repositoryName) { - return blockClusterManagerFromFinalizingSnapshotOnIndexFile(repositoryName); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #blockClusterManagerOnWriteIndexFile(String)} */ - @Deprecated - public static String blockMasterOnWriteIndexFile(final String repositoryName) { - return blockClusterManagerOnWriteIndexFile(repositoryName); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #blockClusterManagerFromDeletingIndexNFile(String)} */ - @Deprecated - public static void blockMasterFromDeletingIndexNFile(String repositoryName) { - blockClusterManagerFromDeletingIndexNFile(repositoryName); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #blockClusterManagerFromFinalizingSnapshotOnSnapFile(String)} */ - @Deprecated - public static String blockMasterFromFinalizingSnapshotOnSnapFile(final String repositoryName) { - return blockClusterManagerFromFinalizingSnapshotOnSnapFile(repositoryName); - } - public static String blockNodeWithIndex(final String repositoryName, final String indexName) { for (String node : internalCluster().nodesInclude(indexName)) { ((MockRepository) internalCluster().getInstance(RepositoriesService.class, node).repository(repositoryName)).blockOnDataFiles( @@ -783,10 +759,4 @@ protected void awaitClusterManagerFinishRepoOperations() throws Exception { } }); } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #awaitClusterManagerFinishRepoOperations()} */ - @Deprecated - protected void awaitMasterFinishRepoOperations() throws Exception { - awaitClusterManagerFinishRepoOperations(); - } } diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java index 7b2c653e9bdb2..9ce9e293ef2b0 100644 --- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java @@ -223,13 +223,6 @@ public final class InternalTestCluster extends TestCluster { public static final int DEFAULT_LOW_NUM_CLUSTER_MANAGER_NODES = 1; public static final int DEFAULT_HIGH_NUM_CLUSTER_MANAGER_NODES = 3; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #DEFAULT_LOW_NUM_CLUSTER_MANAGER_NODES} */ - @Deprecated - public static final int DEFAULT_LOW_NUM_MASTER_NODES = DEFAULT_LOW_NUM_CLUSTER_MANAGER_NODES; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #DEFAULT_HIGH_NUM_CLUSTER_MANAGER_NODES} */ - @Deprecated - public static final int DEFAULT_HIGH_NUM_MASTER_NODES = DEFAULT_HIGH_NUM_CLUSTER_MANAGER_NODES; - static final int DEFAULT_MIN_NUM_DATA_NODES = 1; static final int DEFAULT_MAX_NUM_DATA_NODES = TEST_NIGHTLY ? 6 : 3; @@ -899,25 +892,6 @@ public Client nonClusterManagerClient() { throw new AssertionError("No non-cluster-manager client found"); } - /** - * Returns a node client to the current cluster-manager node. - * Note: use this with care tests should not rely on a certain nodes client. - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerClient()} - */ - @Deprecated - public Client masterClient() { - return clusterManagerClient(); - } - - /** - * Returns a node client to random node but not the cluster-manager. This method will fail if no non-cluster-manager client is available. - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #nonClusterManagerClient()} - */ - @Deprecated - public Client nonMasterClient() { - return nonClusterManagerClient(); - } - /** * Returns a client to a coordinating only node */ @@ -976,11 +950,6 @@ public synchronized void close() throws IOException { } } - public static final int REMOVED_MINIMUM_CLUSTER_MANAGER_NODES = Integer.MAX_VALUE; - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #REMOVED_MINIMUM_CLUSTER_MANAGER_NODES} */ - @Deprecated - public static final int REMOVED_MINIMUM_MASTER_NODES = REMOVED_MINIMUM_CLUSTER_MANAGER_NODES; - private final class NodeAndClient implements Closeable { private MockNode node; private final Settings originalNodeSettings; @@ -1016,12 +985,6 @@ public boolean isClusterManagerEligible() { return DiscoveryNode.isClusterManagerNode(node.settings()); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isClusterManagerEligible()} */ - @Deprecated - public boolean isMasterEligible() { - return isClusterManagerEligible(); - } - Client client() { return getOrBuildNodeClient(); } @@ -1663,23 +1626,6 @@ public Iterable getDataOrClusterManagerNodeInstances(Class clazz) { return getInstances(clazz, DATA_NODE_PREDICATE.or(CLUSTER_MANAGER_NODE_PREDICATE)); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getCurrentClusterManagerNodeInstance(Class)} */ - @Deprecated - public synchronized T getCurrentMasterNodeInstance(Class clazz) { - return getCurrentClusterManagerNodeInstance(clazz); - } - - /** - * Returns an Iterable to all instances for the given class >T< across all data and cluster-manager nodes - * in the cluster. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getDataOrClusterManagerNodeInstances(Class)} - */ - @Deprecated - public Iterable getDataOrMasterNodeInstances(Class clazz) { - return getDataOrClusterManagerNodeInstances(clazz); - } - private Iterable getInstances(Class clazz, Predicate predicate) { Iterable filteredNodes = nodes.values().stream().filter(predicate)::iterator; List instances = new ArrayList<>(); @@ -1704,12 +1650,6 @@ public T getClusterManagerNodeInstance(Class clazz) { return getInstance(clazz, CLUSTER_MANAGER_NODE_PREDICATE); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerNodeInstance(Class)} */ - @Deprecated - public T getMasterNodeInstance(Class clazz) { - return getClusterManagerNodeInstance(clazz); - } - private synchronized T getInstance(Class clazz, Predicate predicate) { NodeAndClient randomNodeAndClient = getRandomNodeAndClient(predicate); assert randomNodeAndClient != null; @@ -1832,26 +1772,6 @@ public synchronized void stopRandomNodeNotCurrentClusterManager() throws IOExcep } } - /** - * Stops the current cluster-manager node forcefully. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #stopCurrentClusterManagerNode()} - */ - @Deprecated - public synchronized void stopCurrentMasterNode() throws IOException { - stopCurrentClusterManagerNode(); - } - - /** - * Stops any of the current nodes but not the cluster-manager node. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #stopRandomNodeNotCurrentClusterManager()} - */ - @Deprecated - public synchronized void stopRandomNodeNotCurrentMaster() throws IOException { - stopRandomNodeNotCurrentClusterManager(); - } - /** * Stops all running nodes in cluster */ @@ -2175,27 +2095,6 @@ public String getClusterManagerName(@Nullable String viaNode) { } } - /** - * Returns the name of the current cluster-manager node in the cluster. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerName()} - */ - @Deprecated - public String getMasterName() { - return getClusterManagerName(); - } - - /** - * Returns the name of the current cluster-manager node in the cluster and executes the request via the node specified - * in the viaNode parameter. If viaNode isn't specified a random node will be picked to the send the request to. - * - * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerName(String)} - */ - @Deprecated - public String getMasterName(@Nullable String viaNode) { - return getClusterManagerName(viaNode); - } - synchronized Set allDataNodesButN(int count) { final int numNodes = numDataNodes() - count; assert size() >= numNodes; @@ -2405,18 +2304,6 @@ public List startClusterManagerOnlyNodes(int numNodes, Settings settings return startNodes(numNodes, Settings.builder().put(onlyRole(settings, DiscoveryNodeRole.CLUSTER_MANAGER_ROLE)).build()); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #startClusterManagerOnlyNodes(int)} */ - @Deprecated - public List startMasterOnlyNodes(int numNodes) { - return startClusterManagerOnlyNodes(numNodes); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #startClusterManagerOnlyNodes(int, Settings)} */ - @Deprecated - public List startMasterOnlyNodes(int numNodes, Settings settings) { - return startClusterManagerOnlyNodes(numNodes, settings); - } - public List startDataAndSearchNodes(int numNodes) { return startDataAndSearchNodes(numNodes, Settings.EMPTY); } @@ -2466,18 +2353,6 @@ public String startClusterManagerOnlyNode(Settings settings) { return startNode(settings1); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #startClusterManagerOnlyNode()} */ - @Deprecated - public String startMasterOnlyNode() { - return startClusterManagerOnlyNode(); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #startClusterManagerOnlyNode(Settings)} */ - @Deprecated - public String startMasterOnlyNode(Settings settings) { - return startClusterManagerOnlyNode(settings); - } - public String startDataOnlyNode() { return startDataOnlyNode(Settings.EMPTY); } @@ -2521,12 +2396,6 @@ public int numClusterManagerNodes() { return filterNodes(nodes, NodeAndClient::isClusterManagerEligible).size(); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #numClusterManagerNodes()} */ - @Deprecated - public int numMasterNodes() { - return numClusterManagerNodes(); - } - public void setDisruptionScheme(ServiceDisruptionScheme scheme) { assert activeDisruptionScheme == null : "there is already and active disruption [" + activeDisruptionScheme diff --git a/test/framework/src/main/java/org/opensearch/test/NodeRoles.java b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java index 4285ac76fc4d4..a3b4431c5aeb8 100644 --- a/test/framework/src/main/java/org/opensearch/test/NodeRoles.java +++ b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java @@ -192,42 +192,6 @@ public static Settings nonClusterManagerNode(final Settings settings) { return removeRoles(settings, Collections.singleton(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE)); } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNode()} */ - @Deprecated - public static Settings masterNode() { - return clusterManagerNode(); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNode(Settings)} */ - @Deprecated - public static Settings masterNode(final Settings settings) { - return clusterManagerNode(settings); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOnlyNode()} */ - @Deprecated - public static Settings masterOnlyNode() { - return clusterManagerOnlyNode(); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOnlyNode(Settings)} */ - @Deprecated - public static Settings masterOnlyNode(final Settings settings) { - return clusterManagerOnlyNode(settings); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #nonClusterManagerNode()} */ - @Deprecated - public static Settings nonMasterNode() { - return nonClusterManagerNode(); - } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #nonClusterManagerNode(Settings)} */ - @Deprecated - public static Settings nonMasterNode(final Settings settings) { - return nonClusterManagerNode(settings); - } - public static Settings remoteClusterClientNode() { return remoteClusterClientNode(Settings.EMPTY); } diff --git a/test/framework/src/main/java/org/opensearch/test/TestCluster.java b/test/framework/src/main/java/org/opensearch/test/TestCluster.java index f5a439e2ffd02..16cc797e6d792 100644 --- a/test/framework/src/main/java/org/opensearch/test/TestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/TestCluster.java @@ -129,19 +129,7 @@ public void assertAfterTest() throws Exception { /** * Returns the number of data and cluster-manager eligible nodes in the cluster. */ - // TODO: Add abstract keyword after removing the deprecated numDataAndMasterNodes() - public int numDataAndClusterManagerNodes() { - return numDataAndMasterNodes(); - } - - /** - * Returns the number of data and cluster-manager eligible nodes in the cluster. - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #numDataAndClusterManagerNodes()} - */ - @Deprecated - public int numDataAndMasterNodes() { - throw new UnsupportedOperationException("Must be overridden"); - } + public abstract int numDataAndClusterManagerNodes(); /** * Returns the http addresses of the nodes within the cluster. diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java index 849d7e4685a76..ec15e5bf03628 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java @@ -109,12 +109,6 @@ public Version getClusterManagerVersion() { return clusterManagerVersion; } - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerVersion()} */ - @Deprecated - public Version getMasterVersion() { - return getClusterManagerVersion(); - } - /** * Calls an api with the provided parameters and body */ diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java index 2095a8c5eaa1f..d150e214a49c3 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java @@ -231,11 +231,4 @@ public Version esVersion() { public Version clusterManagerVersion() { return clientYamlTestClient.getClusterManagerVersion(); } - - /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerVersion()} */ - @Deprecated - public Version masterVersion() { - return clusterManagerVersion(); - } - }