Fix on top of fix

Author: nielsbauman

server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java

@@ -135,9 +135,7 @@ public void testCreateIndexStopsWaitingWhenIndexDeleted() throws Exception {
             .execute();
 
         logger.info("--> wait until the cluster state contains the new index");
-        assertBusy(
-            () -> assertTrue(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().getProject().hasIndex(indexName))
-        );
+        awaitClusterState(state -> state.metadata().getProject().hasIndex(indexName));
 
         logger.info("--> delete the index");
         assertAcked(indicesAdmin().prepareDelete(indexName));

server/src/internalClusterTest/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java

@@ -146,7 +146,7 @@ public void testElectMasterWithLatestVersion() throws Exception {
 
         isolateAllNodes.stopDisrupting();
 
-        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setWaitForMaster(true).get().getState();
         if (state.metadata().getProject().hasIndex("test") == false) {
             fail("index 'test' was lost. current cluster state: " + state);
         }

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -67,7 +67,6 @@
 import org.elasticsearch.action.admin.cluster.snapshots.status.TransportNodesSnapshotsStatus;
 import org.elasticsearch.action.admin.cluster.snapshots.status.TransportSnapshotsStatusAction;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateAction;
-import org.elasticsearch.action.admin.cluster.state.RemoteClusterStateAction;
 import org.elasticsearch.action.admin.cluster.state.TransportClusterStateAction;
 import org.elasticsearch.action.admin.cluster.state.TransportRemoteClusterStateAction;
 import org.elasticsearch.action.admin.cluster.stats.TransportClusterStatsAction;
@@ -655,7 +654,6 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
         actions.register(TransportDeleteDesiredBalanceAction.TYPE, TransportDeleteDesiredBalanceAction.class);
         actions.register(TransportClusterStatsAction.TYPE, TransportClusterStatsAction.class);
         actions.register(ClusterStateAction.INSTANCE, TransportClusterStateAction.class);
-        actions.register(RemoteClusterStateAction.INSTANCE, TransportRemoteClusterStateAction.class);
         actions.register(TransportClusterHealthAction.TYPE, TransportClusterHealthAction.class);
         actions.register(ClusterUpdateSettingsAction.INSTANCE, TransportClusterUpdateSettingsAction.class);
         actions.register(ClusterGetSettingsAction.INSTANCE, TransportClusterGetSettingsAction.class);
@@ -1061,7 +1059,7 @@ protected void configure() {
             bind(action.getTransportAction()).asEagerSingleton();
             transportActionsBinder.addBinding(action.getAction()).to(action.getTransportAction()).asEagerSingleton();
         }
-
+        bind(TransportRemoteClusterStateAction.class).asEagerSingleton();
     }
 
     public ActionFilters getActionFilters() {

server/src/main/java/org/elasticsearch/action/admin/cluster/state/RemoteClusterStateAction.java

@@ -15,7 +15,7 @@
 public class RemoteClusterStateAction extends ActionType<ClusterStateResponse> {
 
     public static final RemoteClusterStateAction INSTANCE = new RemoteClusterStateAction();
-    public static final String NAME = "cluster:monitor/state_remote";
+    public static final String NAME = "cluster:monitor/state";
     public static final RemoteClusterActionType<ClusterStateResponse> REMOTE_TYPE = new RemoteClusterActionType<>(
         NAME,
         ClusterStateResponse::new

server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java

@@ -14,7 +14,6 @@
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRunnable;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.ChannelActionListener;
 import org.elasticsearch.action.support.local.TransportLocalClusterStateAction;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ClusterStateObserver;
@@ -59,11 +58,6 @@ public class TransportClusterStateAction extends TransportLocalClusterStateActio
     private final IndexNameExpressionResolver indexNameExpressionResolver;
     private final ThreadPool threadPool;
 
-    /**
-     * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until
-     * we no longer need to support calling this action remotely.
-     */
-    @SuppressWarnings("this-escape")
     @Inject
     public TransportClusterStateAction(
         TransportService transportService,
@@ -83,15 +77,6 @@ public TransportClusterStateAction(
         this.projectResolver = projectResolver;
         this.indexNameExpressionResolver = indexNameExpressionResolver;
         this.threadPool = threadPool;
-
-        transportService.registerRequestHandler(
-            actionName,
-            executor,
-            false,
-            true,
-            ClusterStateRequest::new,
-            (request, channel, task) -> executeDirect(task, request, new ChannelActionListener<>(channel))
-        );
     }
 
     @Override