Address review comment: use new naming conventions

Author: pawankartik-elastic

…emoteFieldCapsForceConnectTimeoutIT.java …ster/FieldCapsForceConnectTimeoutIT.javaserver/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteFieldCapsForceConnectTimeoutIT.java renamed to server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/RemoteFieldCapsForceConnectTimeoutIT.java renamed to server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/FieldCapsForceConnectTimeoutIT.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.indices.cluster;
 
 import org.elasticsearch.ElasticsearchTimeoutException;
+import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
 import org.elasticsearch.action.fieldcaps.TransportFieldCapabilitiesAction;
 import org.elasticsearch.common.settings.Setting;
@@ -29,9 +30,9 @@
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 
-public class RemoteFieldCapsForceConnectTimeoutIT extends AbstractMultiClustersTestCase {
-    private static final String REMOTE_CLUSTER_1 = "cluster-a";
-    private static final String REMOTE_CLUSTER_2 = "cluster-b";
+public class FieldCapsForceConnectTimeoutIT extends AbstractMultiClustersTestCase {
+    private static final String LINKED_CLUSTER_1 = "cluster-a";
+    private static final String LINKED_CLUSTER_2 = "cluster-b";
 
     public static class ForceConnectTimeoutPlugin extends Plugin implements ClusterPlugin {
         @Override
@@ -47,7 +48,7 @@ public List<Setting<?>> getSettings() {
 
     @Override
     protected List<String> remoteClusterAlias() {
-        return List.of(REMOTE_CLUSTER_1, REMOTE_CLUSTER_2);
+        return List.of(LINKED_CLUSTER_1, LINKED_CLUSTER_2);
     }
 
     @Override
@@ -67,7 +68,7 @@ protected Settings nodeSettings() {
 
     @Override
     protected Map<String, Boolean> skipUnavailableForRemoteClusters() {
-        return Map.of(REMOTE_CLUSTER_1, true, REMOTE_CLUSTER_2, true);
+        return Map.of(LINKED_CLUSTER_1, true, LINKED_CLUSTER_2, true);
     }
 
     public void testTimeoutSetting() {
@@ -76,7 +77,7 @@ public void testTimeoutSetting() {
             MockTransportService mts = (MockTransportService) cluster(LOCAL_CLUSTER).getInstance(TransportService.class, nodeName);
 
             mts.addConnectBehavior(
-                cluster(REMOTE_CLUSTER_1).getInstance(TransportService.class, (String) null),
+                cluster(LINKED_CLUSTER_1).getInstance(TransportService.class, (String) null),
                 ((transport, discoveryNode, profile, listener) -> {
                     try {
                         latch.await();
@@ -90,27 +91,27 @@ public void testTimeoutSetting() {
         }
 
         // Add some dummy data to prove we are communicating fine with the remote.
-        assertAcked(client(REMOTE_CLUSTER_1).admin().indices().prepareCreate("test-index"));
-        client(REMOTE_CLUSTER_1).prepareIndex("test-index").setSource("sample-field", "sample-value").get();
-        client(REMOTE_CLUSTER_1).admin().indices().prepareRefresh("test-index").get();
+        assertAcked(client(LINKED_CLUSTER_1).admin().indices().prepareCreate("test-index"));
+        client(LINKED_CLUSTER_1).prepareIndex("test-index").setSource("sample-field", "sample-value").get();
+        client(LINKED_CLUSTER_1).admin().indices().prepareRefresh("test-index").get();
 
         /*
          * Do a full restart so that our custom connect behaviour takes effect since it does not apply to
          * pre-existing connections -- they're already established by the time this test runs.
          */
         try {
-            cluster(REMOTE_CLUSTER_1).fullRestart();
+            cluster(LINKED_CLUSTER_1).fullRestart();
         } catch (Exception e) {
             throw new AssertionError(e);
         } finally {
             var fieldCapsRequest = new FieldCapabilitiesRequest();
             /*
-             * We have a local and 2 remote clusters but will target only the remote that we stalled.
-             * This is because when the timeout kicks in, and we move on from the stalled remote, we do not want
+             * We have an origin and 2 linked clusters but will target only the one that we stalled.
+             * This is because when the timeout kicks in, and we move on from the stalled cluster, we do not want
              * the error to be a top-level error. Rather, it must be present in the response object under "failures".
              * All other errors are free to be top-level errors though.
              */
-            fieldCapsRequest.indices(REMOTE_CLUSTER_1 + ":*");
+            fieldCapsRequest.indices(LINKED_CLUSTER_1 + ":*");
             fieldCapsRequest.fields("foo", "bar", "baz");
             var result = safeGet(client().execute(TransportFieldCapabilitiesAction.TYPE, fieldCapsRequest));
 
@@ -126,8 +127,9 @@ public void testTimeoutSetting() {
                 Matchers.containsString("java.lang.IllegalStateException: Unable to open any connections")
             );
 
-            // The actual error that is thrown by the subscribable listener when a remote could not be talked to.
+            // The actual error that is thrown by the subscribable listener when a linked cluster could not be talked to.
             assertThat(failure.getException().getCause(), Matchers.instanceOf(ElasticsearchTimeoutException.class));
+            assertThat(ExceptionsHelper.isRemoteUnavailableException(failure.getException()), Matchers.is(true));
 
             latch.countDown();
             result.decRef();

server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java

@@ -146,17 +146,17 @@ protected void doExecute(Task task, FieldCapabilitiesRequest request, final Acti
     public void executeRequest(
         Task task,
         FieldCapabilitiesRequest request,
-        RemoteRequestExecutor remoteRequestExecutor,
+        LinkedRequestExecutor linkedRequestExecutor,
         ActionListener<FieldCapabilitiesResponse> listener
     ) {
         // workaround for https://github.com/elastic/elasticsearch/issues/97916 - TODO remove this when we can
-        searchCoordinationExecutor.execute(ActionRunnable.wrap(listener, l -> doExecuteForked(task, request, remoteRequestExecutor, l)));
+        searchCoordinationExecutor.execute(ActionRunnable.wrap(listener, l -> doExecuteForked(task, request, linkedRequestExecutor, l)));
     }
 
     private void doExecuteForked(
         Task task,
         FieldCapabilitiesRequest request,
-        RemoteRequestExecutor remoteRequestExecutor,
+        LinkedRequestExecutor linkedRequestExecutor,
         ActionListener<FieldCapabilitiesResponse> listener
     ) {
         if (ccsCheckCompatibility) {
@@ -322,7 +322,7 @@ private void doExecuteForked(
                         true,
                         ActionListener.releaseAfter(remoteListener, refs.acquire())
                     ).delegateFailure(
-                        (responseListener, conn) -> remoteRequestExecutor.executeRemoteRequest(
+                        (responseListener, conn) -> linkedRequestExecutor.executeRemoteRequest(
                             transportService,
                             conn,
                             remoteRequest,
@@ -362,7 +362,7 @@ public void onFailure(Exception e) {
         });
     }
 
-    public interface RemoteRequestExecutor {
+    public interface LinkedRequestExecutor {
         void executeRemoteRequest(
             TransportService transportService,
             Transport.Connection conn,
@@ -623,8 +623,8 @@ List<FieldCapabilitiesFailure> build(Set<String> successfulIndices) {
                 String index = failure.getKey();
                 Exception e = failure.getValue();
                 /*
-                 * The listener we use to briefly try, and connect to a remote can throw an ElasticsearchTimeoutException
-                 * error if a remote cannot be reached. To make sure we correctly recognise this scenario via
+                 * The listener we use to briefly try, and connect to a linked cluster can throw an ElasticsearchTimeoutException
+                 * error if it cannot be reached. To make sure we correctly recognise this scenario via
                  * ExceptionsHelper.isRemoteUnavailableException(), we wrap this error appropriately.
                  */
                 if (e instanceof ElasticsearchTimeoutException ete) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlResolveFieldsAction.java

@@ -51,18 +51,18 @@ public EsqlResolveFieldsAction(
 
     @Override
     protected void doExecute(Task task, FieldCapabilitiesRequest request, final ActionListener<FieldCapabilitiesResponse> listener) {
-        fieldCapsAction.executeRequest(task, request, this::executeRemoteRequest, listener);
+        fieldCapsAction.executeRequest(task, request, this::executeLinkedRequest, listener);
     }
 
-    void executeRemoteRequest(
+    void executeLinkedRequest(
         TransportService transportService,
         Transport.Connection conn,
-        FieldCapabilitiesRequest remoteRequest,
+        FieldCapabilitiesRequest request,
         ActionListenerResponseHandler<FieldCapabilitiesResponse> responseHandler
     ) {
         var remoteAction = conn.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)
             ? RESOLVE_REMOTE_TYPE
             : TransportFieldCapabilitiesAction.REMOTE_TYPE;
-        transportService.sendRequest(conn, remoteAction.name(), remoteRequest, TransportRequestOptions.EMPTY, responseHandler);
+        transportService.sendRequest(conn, remoteAction.name(), request, TransportRequestOptions.EMPTY, responseHandler);
     }
 }