With cluster

Author: nik9000

server/src/main/java/org/elasticsearch/rest/RestResponse.java

@@ -127,7 +127,7 @@ public RestResponse(RestChannel channel, RestStatus status, Exception e) throws
         ToXContent.Params params = channel.request();
         if (e != null) {
             Level level = status.getStatus() < 500 || ExceptionsHelper.isNodeOrShardUnavailableTypeException(e) ? Level.DEBUG : Level.WARN;
-            logSuppressedError(level, channel.request().rawPath(), channel.request().params(), status, e);
+            logSuppressedError(level, channel.request().rawPath(), channel.request().params(), status, null, e);
         }
         // if "error_trace" is turned on in the request, we want to render it in the rest response
         // for that the REST_EXCEPTION_SKIP_STACK_TRACE flag that if "true" omits the stack traces is
@@ -248,13 +248,20 @@ public void close() {
     /**
      * Log failures to the {@code rest.suppressed} logger.
      */
-    public static void logSuppressedError(Level level, String rawPath, Map<String, String> params, RestStatus status, Exception e) {
+    public static void logSuppressedError(
+        Level level,
+        String rawPath,
+        Map<String, String> params,
+        RestStatus status,
+        @Nullable String extra,
+        Exception e
+    ) {
         if (SUPPRESSED_ERROR_LOGGER.isEnabled(level)) {
-            SUPPRESSED_ERROR_LOGGER.log(
-                level,
-                String.format(Locale.ROOT, "path: %s, params: %s, status: %d", rawPath, params, status.getStatus()),
-                e
-            );
+            String message = String.format(Locale.ROOT, "path: %s, params: %s, status: %d", rawPath, params, status.getStatus());
+            if (extra != null) {
+                message += ", " + extra;
+            }
+            SUPPRESSED_ERROR_LOGGER.log(level, message, e);
         }
     }
 }

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

@@ -22,6 +22,7 @@
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.rest.action.RestRefCountedChunkedToXContentListener;
+import org.elasticsearch.transport.RemoteClusterAware;
 import org.elasticsearch.xcontent.MediaType;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.esql.arrow.ArrowFormat;
@@ -237,10 +238,19 @@ private void checkDelimiter() {
      * Log all partial request failures to the {@code rest.suppressed} logger
      * so an operator can categorize them after the fact.
      */
-    static void logPartialFailures(String rawPath, Map<String, String> params, EsqlExecutionInfo exeuctionInfo) {
-        for (EsqlExecutionInfo.Cluster cluster : exeuctionInfo.getClusters().values()) {
+    static void logPartialFailures(String rawPath, Map<String, String> params, EsqlExecutionInfo executionInfo) {
+        for (EsqlExecutionInfo.Cluster cluster : executionInfo.getClusters().values()) {
             for (ShardSearchFailure failure : cluster.getFailures()) {
-                RestResponse.logSuppressedError(org.apache.logging.log4j.Level.WARN, rawPath, params, RestStatus.OK, failure);
+                RestResponse.logSuppressedError(
+                    org.apache.logging.log4j.Level.WARN,
+                    rawPath,
+                    params,
+                    RestStatus.OK,
+                    cluster.getClusterAlias().equals(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY)
+                        ? null
+                        : "cluster: " + cluster.getClusterAlias(),
+                    failure
+                );
             }
         }
     }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlResponseListenerTests.java

@@ -21,6 +21,7 @@
 import org.elasticsearch.search.SearchShardTarget;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.transport.RemoteClusterAware;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
@@ -29,6 +30,7 @@
 import java.util.Map;
 
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
 
 public class EsqlResponseListenerTests extends ESTestCase {
     private final String LOCAL_CLUSTER_ALIAS = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY;
@@ -44,13 +46,18 @@ public static void init() throws IllegalAccessException {
         Loggers.addAppender(restSuppressedLogger, appender);
     }
 
+    @After
+    public void clear() {
+        appender.events.clear();
+    }
+
     @AfterClass
     public static void cleanup() {
         appender.stop();
         Loggers.removeAppender(restSuppressedLogger, appender);
     }
 
-    public void testLogPartialResponseErrors() {
+    public void testLogPartialFailures() {
         EsqlExecutionInfo executionInfo = new EsqlExecutionInfo(false);
         executionInfo.swapCluster(
             LOCAL_CLUSTER_ALIAS,
@@ -72,6 +79,7 @@ public void testLogPartialResponseErrors() {
         );
         EsqlResponseListener.logPartialFailures("/_query", Map.of(), executionInfo);
 
+        assertThat(appender.events, hasSize(2));
         LogEvent logEvent = appender.events.get(0);
         assertThat(logEvent.getLevel(), equalTo(Level.WARN));
         assertThat(logEvent.getMessage().getFormattedMessage(), equalTo("path: /_query, params: {}, status: 200"));
@@ -82,6 +90,32 @@ public void testLogPartialResponseErrors() {
         assertThat(logEvent.getThrown().getCause().getMessage(), equalTo("error"));
     }
 
+    public void testLogPartialFailuresRemote() {
+        EsqlExecutionInfo executionInfo = new EsqlExecutionInfo(false);
+        executionInfo.swapCluster(
+            "remote_cluster",
+            (k, v) -> new EsqlExecutionInfo.Cluster(
+                "remote_cluster",
+                "idx",
+                false,
+                EsqlExecutionInfo.Cluster.Status.SUCCESSFUL,
+                10,
+                10,
+                3,
+                0,
+                List.of(new ShardSearchFailure(new Exception("dummy"), target(0))),
+                new TimeValue(4444L)
+            )
+        );
+        EsqlResponseListener.logPartialFailures("/_query", Map.of(), executionInfo);
+
+        assertThat(appender.events, hasSize(1));
+        LogEvent logEvent = appender.events.get(0);
+        assertThat(logEvent.getLevel(), equalTo(Level.WARN));
+        assertThat(logEvent.getMessage().getFormattedMessage(), equalTo("path: /_query, params: {}, status: 200, cluster: remote_cluster"));
+        assertThat(logEvent.getThrown().getCause().getMessage(), equalTo("dummy"));
+    }
+
     private SearchShardTarget target(int shardId) {
         return new SearchShardTarget("node", new ShardId("idx", "uuid", 0), LOCAL_CLUSTER_ALIAS);
     }