Remove master term from AckedRequest

server/src/main/java/org/opensearch/action/admin/indices/alias/TransportIndicesAliasesAction.java

@@ -201,7 +201,7 @@ protected void clusterManagerOperation(
         request.aliasActions().clear();
         IndicesAliasesClusterStateUpdateRequest updateRequest = new IndicesAliasesClusterStateUpdateRequest(unmodifiableList(finalActions))
             .ackTimeout(request.timeout())
-            .masterNodeTimeout(request.clusterManagerNodeTimeout());
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout());
 
         indexAliasesService.indicesAliases(updateRequest, new ActionListener<ClusterStateUpdateResponse>() {
             @Override

server/src/main/java/org/opensearch/action/admin/indices/close/TransportCloseIndexAction.java

@@ -164,7 +164,7 @@ protected void clusterManagerOperation(
         final CloseIndexClusterStateUpdateRequest closeRequest = new CloseIndexClusterStateUpdateRequest(task.getId()).ackTimeout(
             request.timeout()
         )
-            .masterNodeTimeout(request.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout())
             .waitForActiveShards(request.waitForActiveShards())
             .indices(concreteIndices);
         indexStateService.closeIndices(closeRequest, ActionListener.delegateResponse(listener, (delegatedListener, t) -> {

server/src/main/java/org/opensearch/action/admin/indices/create/AutoCreateAction.java

@@ -174,7 +174,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                                 request.cause(),
                                 indexName,
                                 request.index()
-                            ).ackTimeout(request.timeout()).masterNodeTimeout(request.clusterManagerNodeTimeout());
+                            ).ackTimeout(request.timeout()).clusterManagerNodeTimeout(request.clusterManagerNodeTimeout());
                             return createIndexService.applyCreateIndexRequest(currentState, updateRequest, false);
                         }
                     }

server/src/main/java/org/opensearch/action/admin/indices/create/TransportCreateIndexAction.java

@@ -117,7 +117,7 @@ protected void clusterManagerOperation(
             indexName,
             request.index()
         ).ackTimeout(request.timeout())
-            .masterNodeTimeout(request.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout())
             .settings(request.settings())
             .mappings(request.mappings())
             .aliases(request.aliases())

server/src/main/java/org/opensearch/action/admin/indices/delete/TransportDeleteIndexAction.java

@@ -127,7 +127,7 @@ protected void clusterManagerOperation(
         }
 
         DeleteIndexClusterStateUpdateRequest deleteRequest = new DeleteIndexClusterStateUpdateRequest().ackTimeout(request.timeout())
-            .masterNodeTimeout(request.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout())
             .indices(concreteIndices.toArray(new Index[0]));
 
         deleteIndexService.deleteIndices(deleteRequest, new ActionListener<ClusterStateUpdateResponse>() {

server/src/main/java/org/opensearch/action/admin/indices/mapping/put/TransportPutMappingAction.java

@@ -171,7 +171,7 @@ static void performMappingUpdate(
     ) {
         PutMappingClusterStateUpdateRequest updateRequest = new PutMappingClusterStateUpdateRequest(request.source()).indices(
             concreteIndices
-        ).ackTimeout(request.timeout()).masterNodeTimeout(request.clusterManagerNodeTimeout());
+        ).ackTimeout(request.timeout()).clusterManagerNodeTimeout(request.clusterManagerNodeTimeout());
 
         metadataMappingService.putMapping(updateRequest, new ActionListener<ClusterStateUpdateResponse>() {
 

server/src/main/java/org/opensearch/action/admin/indices/open/TransportOpenIndexAction.java

@@ -125,7 +125,7 @@ protected void clusterManagerOperation(
             return;
         }
         OpenIndexClusterStateUpdateRequest updateRequest = new OpenIndexClusterStateUpdateRequest().ackTimeout(request.timeout())
-            .masterNodeTimeout(request.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout())
             .indices(concreteIndices)
             .waitForActiveShards(request.waitForActiveShards());
 

server/src/main/java/org/opensearch/action/admin/indices/readonly/TransportAddIndexBlockAction.java

@@ -144,7 +144,7 @@ protected void clusterManagerOperation(
         final AddIndexBlockClusterStateUpdateRequest addBlockRequest = new AddIndexBlockClusterStateUpdateRequest(
             request.getBlock(),
             task.getId()
-        ).ackTimeout(request.timeout()).masterNodeTimeout(request.clusterManagerNodeTimeout()).indices(concreteIndices);
+        ).ackTimeout(request.timeout()).clusterManagerNodeTimeout(request.clusterManagerNodeTimeout()).indices(concreteIndices);
         indexStateService.addIndexBlock(addBlockRequest, ActionListener.delegateResponse(listener, (delegatedListener, t) -> {
             logger.debug(() -> new ParameterizedMessage("failed to mark indices as readonly [{}]", (Object) concreteIndices), t);
             delegatedListener.onFailure(t);

server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java

@@ -293,7 +293,7 @@ static CreateIndexClusterStateUpdateRequest prepareCreateIndexRequest(
             b.put(settings);
         }
         return new CreateIndexClusterStateUpdateRequest(cause, targetIndexName, providedIndexName).ackTimeout(createIndexRequest.timeout())
-            .masterNodeTimeout(createIndexRequest.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(createIndexRequest.clusterManagerNodeTimeout())
             .settings(b.build())
             .aliases(createIndexRequest.aliases())
             .waitForActiveShards(ActiveShardCount.NONE) // not waiting for shards here, will wait on the alias switch operation

server/src/main/java/org/opensearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java

@@ -165,7 +165,7 @@ protected void clusterManagerOperation(
             .settings(request.settings())
             .setPreserveExisting(request.isPreserveExisting())
             .ackTimeout(request.timeout())
-            .masterNodeTimeout(request.clusterManagerNodeTimeout());
+            .clusterManagerNodeTimeout(request.clusterManagerNodeTimeout());
 
         updateSettingsService.updateSettings(clusterStateUpdateRequest, new ActionListener<ClusterStateUpdateResponse>() {
             @Override

server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java

@@ -322,7 +322,7 @@ static CreateIndexClusterStateUpdateRequest prepareCreateIndexRequest(
             // applied once we took the snapshot and if somebody messes things up and switches the index read/write and adds docs we
             // miss the mappings for everything is corrupted and hard to debug
             .ackTimeout(targetIndex.timeout())
-            .masterNodeTimeout(targetIndex.clusterManagerNodeTimeout())
+            .clusterManagerNodeTimeout(targetIndex.clusterManagerNodeTimeout())
             .settings(targetIndex.settings())
             .aliases(targetIndex.aliases())
             .waitForActiveShards(targetIndex.waitForActiveShards())

server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java

@@ -109,7 +109,7 @@ protected void clusterManagerOperation(
     ) {
         UpgradeSettingsClusterStateUpdateRequest clusterStateUpdateRequest = new UpgradeSettingsClusterStateUpdateRequest().ackTimeout(
             request.timeout()
-        ).versions(request.versions()).masterNodeTimeout(request.clusterManagerNodeTimeout());
+        ).versions(request.versions()).clusterManagerNodeTimeout(request.clusterManagerNodeTimeout());
 
         updateSettingsService.upgradeIndexSettings(clusterStateUpdateRequest, new ActionListener<ClusterStateUpdateResponse>() {
             @Override

server/src/main/java/org/opensearch/cluster/AckedClusterStateUpdateTask.java

@@ -103,6 +103,6 @@ public TimeValue ackTimeout() {
 
     @Override
     public TimeValue timeout() {
-        return request.masterNodeTimeout();
+        return request.clusterManagerNodeTimeout();
     }
 }

server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java

@@ -48,18 +48,6 @@ public interface AckedRequest {
 
     /**
      * 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
-    default TimeValue masterNodeTimeout() {
-        throw new UnsupportedOperationException("Must be overridden");
-    }
-
-    /**
-     * Returns the timeout for the request to be completed on the cluster-manager node
-     */
-    // TODO: Remove default implementation after removing the deprecated masterNodeTimeout()
-    default TimeValue clusterManagerNodeTimeout() {
-        return masterNodeTimeout();
-    }
+    TimeValue clusterManagerNodeTimeout();
 }

server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateRequest.java

@@ -43,7 +43,7 @@
 public abstract class ClusterStateUpdateRequest<T extends ClusterStateUpdateRequest<T>> implements AckedRequest {
 
     private TimeValue ackTimeout;
-    private TimeValue masterNodeTimeout;
+    private TimeValue clusterManagerNodeTimeout;
 
     /**
      * Returns the maximum time interval to wait for acknowledgements
@@ -67,16 +67,16 @@ public T ackTimeout(TimeValue ackTimeout) {
      * be completed on the cluster-manager node
      */
     @Override
-    public TimeValue masterNodeTimeout() {
-        return masterNodeTimeout;
+    public TimeValue clusterManagerNodeTimeout() {
+        return clusterManagerNodeTimeout;
     }
 
     /**
      * Sets the cluster-manager node timeout
      */
     @SuppressWarnings("unchecked")
-    public T masterNodeTimeout(TimeValue masterNodeTimeout) {
-        this.masterNodeTimeout = masterNodeTimeout;
+    public T clusterManagerNodeTimeout(TimeValue clusterManagerNodeTimeout) {
+        this.clusterManagerNodeTimeout = clusterManagerNodeTimeout;
         return (T) this;
     }
 }

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java

@@ -98,7 +98,7 @@ public void createDataStream(CreateDataStreamClusterStateUpdateRequest request,
                 activeShardsObserver.waitForActiveShards(
                     new String[] { firstBackingIndexName },
                     ActiveShardCount.DEFAULT,
-                    request.masterNodeTimeout(),
+                    request.clusterManagerNodeTimeout(),
                     shardsAcked -> {
                         finalListener.onResponse(new AcknowledgedResponse(true));
                     },
@@ -147,7 +147,7 @@ public static final class CreateDataStreamClusterStateUpdateRequest extends Clus
 
         public CreateDataStreamClusterStateUpdateRequest(String name, TimeValue masterNodeTimeout, TimeValue timeout) {
             this.name = name;
-            masterNodeTimeout(masterNodeTimeout);
+            clusterManagerNodeTimeout(masterNodeTimeout);
             ackTimeout(timeout);
         }
     }

server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java

@@ -294,7 +294,7 @@ public void onFailure(final String source, final Exception e) {
 
                 @Override
                 public TimeValue timeout() {
-                    return request.masterNodeTimeout();
+                    return request.clusterManagerNodeTimeout();
                 }
             }
         );
@@ -568,7 +568,7 @@ public void onFailure(final String source, final Exception e) {
 
                 @Override
                 public TimeValue timeout() {
-                    return request.masterNodeTimeout();
+                    return request.clusterManagerNodeTimeout();
                 }
             }
         );

server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java

@@ -366,7 +366,7 @@ public void putMapping(final PutMappingClusterStateUpdateRequest request, final
         clusterService.submitStateUpdateTask(
             "put-mapping " + Strings.arrayToCommaDelimitedString(request.indices()),
             request,
-            ClusterStateTaskConfig.build(Priority.HIGH, request.masterNodeTimeout()),
+            ClusterStateTaskConfig.build(Priority.HIGH, request.clusterManagerNodeTimeout()),
             putMappingExecutor,
             new AckedClusterStateTaskListener() {