Rename request field to masterTimeout

server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java

@@ -22,18 +22,22 @@
  */
 public abstract class LocalClusterStateRequest extends ActionRequest {
 
- private final TimeValue clusterUpdateTimeout;
-
- protected LocalClusterStateRequest(TimeValue clusterUpdateTimeout) {
- this.clusterUpdateTimeout = Objects.requireNonNull(clusterUpdateTimeout);
+ /**
+ * The timeout for waiting until the cluster is unblocked.
+ * We use the name <code>masterTimeout</code> to be consistent with the master node actions.
+ */
+ private final TimeValue masterTimeout;
+
+ protected LocalClusterStateRequest(TimeValue masterTimeout) {
+ this.masterTimeout = Objects.requireNonNull(masterTimeout);
  }
 
  @Override
  public void writeTo(StreamOutput out) throws IOException {
  TransportAction.localOnly();
  }
 
- public TimeValue clusterUpdateTimeout() {
- return clusterUpdateTimeout;
+ public TimeValue masterTimeout() {
+ return masterTimeout;
  }
 }

server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java

@@ -96,7 +96,7 @@ private void waitForClusterUnblock(
  var observer = new ClusterStateObserver(
  initialState,
  clusterService,
- request.clusterUpdateTimeout(),
+ request.masterTimeout(),
  logger,
  clusterService.threadPool().getThreadContext()
  );