From b328dbc65b1cbf200cc291e452cfdd71c889b78b Mon Sep 17 00:00:00 2001
From: Harsh Garg <gkharsh@amazon.com>
Date: Wed, 23 Oct 2024 10:19:48 +0530
Subject: [PATCH 1/3] Avoid making further stats calls if paginationStrategy
 outputs empty entities

Signed-off-by: Harsh Garg <gkharsh@amazon.com>
---
 .../shards/TransportCatShardsAction.java      | 19 +++++++++++
 .../rest/action/cat/RestIndicesAction.java    | 32 +++++++++++++++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
index 3dc8c38152a16..1ac4d6068725b 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
@@ -12,6 +12,7 @@
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.PageParams;
 import org.opensearch.action.pagination.ShardPaginationStrategy;
 import org.opensearch.action.support.ActionFilters;
@@ -27,6 +28,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
+import java.util.Collections;
 import java.util.Objects;
 
 import static org.opensearch.common.breaker.ResponseLimitSettings.LimitEntity.SHARDS;
@@ -40,6 +42,13 @@ public class TransportCatShardsAction extends HandledTransportAction<CatShardsRe
 
     private final NodeClient client;
     private final ResponseLimitSettings responseLimitSettings;
+    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
+        new ShardStats[0],
+        0,
+        0,
+        0,
+        Collections.emptyList()
+    );
 
     @Inject
     public TransportCatShardsAction(
@@ -108,6 +117,12 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                                 : paginationStrategy.getRequestedEntities()
                         );
                         catShardsResponse.setPageToken(Objects.isNull(paginationStrategy) ? null : paginationStrategy.getResponseToken());
+                        // For paginated queries, if strategy outputs no shards to be returned, avoid fetching IndicesStats.
+                        if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
+                            catShardsResponse.setIndicesStatsResponse(EMPTY_INDICES_STATS_RESPONSE);
+                            cancellableListener.onResponse(catShardsResponse);
+                            return;
+                        }
                         IndicesStatsRequest indicesStatsRequest = new IndicesStatsRequest();
                         indicesStatsRequest.setShouldCancelOnTimeout(true);
                         indicesStatsRequest.all();
@@ -159,4 +174,8 @@ private void validateRequestLimit(
             }
         }
     }
+
+    private boolean shouldSkipIndicesStatsRequest(ShardPaginationStrategy paginationStrategy) {
+        return Objects.nonNull(paginationStrategy) && paginationStrategy.getRequestedEntities().isEmpty();
+    }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
index b566ba9bbb8e4..805ea9130aff1 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
@@ -43,6 +43,7 @@
 import org.opensearch.action.admin.indices.stats.IndexStats;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.IndexPaginationStrategy;
 import org.opensearch.action.pagination.PageToken;
 import org.opensearch.action.support.GroupedActionListener;
@@ -104,6 +105,13 @@ public class RestIndicesAction extends AbstractListAction {
         "Parameter [master_timeout] is deprecated and will be removed in 3.0. To support inclusive language, please use [cluster_manager_timeout] instead.";
     private static final String DUPLICATE_PARAMETER_ERROR_MESSAGE =
         "Please only use one of the request parameters [master_timeout, cluster_manager_timeout].";
+    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
+        new ShardStats[0],
+        0,
+        0,
+        0,
+        Collections.emptyList()
+    );
 
     private final ResponseLimitSettings responseLimitSettings;
 
@@ -212,13 +220,19 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                                     groupedListener.onResponse(getSettingsResponse);
                                     groupedListener.onResponse(clusterStateResponse);
 
-                                    sendIndicesStatsRequest(
-                                        indicesToBeQueried,
-                                        subRequestIndicesOptions,
-                                        includeUnloadedSegments,
-                                        client,
-                                        ActionListener.wrap(groupedListener::onResponse, groupedListener::onFailure)
-                                    );
+                                    // For paginated queries, if strategy outputs no indices to be returned,
+                                    // avoid fetching indices stats.
+                                    if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
+                                        groupedListener.onResponse(EMPTY_INDICES_STATS_RESPONSE);
+                                    } else {
+                                        sendIndicesStatsRequest(
+                                            indicesToBeQueried,
+                                            subRequestIndicesOptions,
+                                            includeUnloadedSegments,
+                                            client,
+                                            ActionListener.wrap(groupedListener::onResponse, groupedListener::onFailure)
+                                        );
+                                    }
 
                                     sendClusterHealthRequest(
                                         indicesToBeQueried,
@@ -1093,4 +1107,8 @@ public Tuple<String, Settings> next() {
         };
     }
 
+    private boolean shouldSkipIndicesStatsRequest(IndexPaginationStrategy paginationStrategy) {
+        return Objects.nonNull(paginationStrategy) && paginationStrategy.getRequestedEntities().isEmpty();
+    }
+
 }

From 40cc55a85fe08411d80ed1548f6aac7569440e87 Mon Sep 17 00:00:00 2001
From: Harsh Garg <gkharsh@amazon.com>
Date: Wed, 23 Oct 2024 15:33:39 +0530
Subject: [PATCH 2/3] Moving empty IndicesStats creation to Response class

Signed-off-by: Harsh Garg <gkharsh@amazon.com>
---
 .../cluster/shards/TransportCatShardsAction.java      | 11 +----------
 .../admin/indices/stats/IndicesStatsResponse.java     |  5 +++++
 .../opensearch/rest/action/cat/RestIndicesAction.java | 10 +---------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
index 1ac4d6068725b..7b36b7a10f4f2 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
@@ -12,7 +12,6 @@
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.PageParams;
 import org.opensearch.action.pagination.ShardPaginationStrategy;
 import org.opensearch.action.support.ActionFilters;
@@ -28,7 +27,6 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
-import java.util.Collections;
 import java.util.Objects;
 
 import static org.opensearch.common.breaker.ResponseLimitSettings.LimitEntity.SHARDS;
@@ -42,13 +40,6 @@ public class TransportCatShardsAction extends HandledTransportAction<CatShardsRe
 
     private final NodeClient client;
     private final ResponseLimitSettings responseLimitSettings;
-    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
-        new ShardStats[0],
-        0,
-        0,
-        0,
-        Collections.emptyList()
-    );
 
     @Inject
     public TransportCatShardsAction(
@@ -119,7 +110,7 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                         catShardsResponse.setPageToken(Objects.isNull(paginationStrategy) ? null : paginationStrategy.getResponseToken());
                         // For paginated queries, if strategy outputs no shards to be returned, avoid fetching IndicesStats.
                         if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
-                            catShardsResponse.setIndicesStatsResponse(EMPTY_INDICES_STATS_RESPONSE);
+                            catShardsResponse.setIndicesStatsResponse(IndicesStatsResponse.getEmptyResponse());
                             cancellableListener.onResponse(catShardsResponse);
                             return;
                         }
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java
index ae989573b39ea..a5409e076730d 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java
@@ -45,6 +45,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,4 +231,8 @@ static final class Fields {
     public String toString() {
         return Strings.toString(MediaTypeRegistry.JSON, this, true, false);
     }
+
+    public static IndicesStatsResponse getEmptyResponse() {
+        return new IndicesStatsResponse(new ShardStats[0], 0, 0, 0, Collections.emptyList());
+    }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
index 805ea9130aff1..ea73c474e90b8 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
@@ -43,7 +43,6 @@
 import org.opensearch.action.admin.indices.stats.IndexStats;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.IndexPaginationStrategy;
 import org.opensearch.action.pagination.PageToken;
 import org.opensearch.action.support.GroupedActionListener;
@@ -105,13 +104,6 @@ public class RestIndicesAction extends AbstractListAction {
         "Parameter [master_timeout] is deprecated and will be removed in 3.0. To support inclusive language, please use [cluster_manager_timeout] instead.";
     private static final String DUPLICATE_PARAMETER_ERROR_MESSAGE =
         "Please only use one of the request parameters [master_timeout, cluster_manager_timeout].";
-    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
-        new ShardStats[0],
-        0,
-        0,
-        0,
-        Collections.emptyList()
-    );
 
     private final ResponseLimitSettings responseLimitSettings;
 
@@ -223,7 +215,7 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                                     // For paginated queries, if strategy outputs no indices to be returned,
                                     // avoid fetching indices stats.
                                     if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
-                                        groupedListener.onResponse(EMPTY_INDICES_STATS_RESPONSE);
+                                        groupedListener.onResponse(IndicesStatsResponse.getEmptyResponse());
                                     } else {
                                         sendIndicesStatsRequest(
                                             indicesToBeQueried,

From 6d0acfcafc92b7fc22469abd63f50bea76b57167 Mon Sep 17 00:00:00 2001
From: Harsh Garg <gkharsh@amazon.com>
Date: Wed, 23 Oct 2024 16:11:30 +0530
Subject: [PATCH 3/3] Retry Build

Signed-off-by: Harsh Garg <gkharsh@amazon.com>