Fix remote store stats api rejection count response (#7775)

Signed-off-by: Ashish Singh <ssashish@amazon.com>
opensearch-project · May 29, 2023 · be540c4 · be540c4
1 parent 62b155a
commit be540c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...er/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureIT.java b/...er/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureIT.java
@@ -8,12 +8,19 @@
 
 package org.opensearch.remotestore;
 
+import org.opensearch.action.admin.cluster.remotestore.stats.RemoteStoreStats;
+import org.opensearch.action.admin.cluster.remotestore.stats.RemoteStoreStatsResponse;
 import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
+import org.opensearch.index.remote.RemoteRefreshSegmentTracker;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
 
 import static org.opensearch.index.remote.RemoteRefreshSegmentPressureSettings.REMOTE_REFRESH_SEGMENT_PRESSURE_ENABLED;
 
@@ -38,6 +45,18 @@ public void testWritesRejected() {
             () -> indexData(randomIntBetween(10, 20), randomBoolean())
         );
         assertTrue(ex.getMessage().contains("rejected execution on primary shard"));
+        String shardId = "0";
+        RemoteStoreStatsResponse response = client().admin().cluster().prepareRemoteStoreStats(INDEX_NAME, shardId).get();
+        final String indexShardId = String.format(Locale.ROOT, "[%s][%s]", INDEX_NAME, shardId);
+        List<RemoteStoreStats> matches = Arrays.stream(response.getShards())
+            .filter(stat -> indexShardId.equals(stat.getStats().shardId.toString()))
+            .collect(Collectors.toList());
+        assertEquals(1, matches.size());
+        RemoteRefreshSegmentTracker.Stats stats = matches.get(0).getStats();
+        assertTrue(stats.bytesLag > 0);
+        assertTrue(stats.refreshTimeLagMs > 0);
+        assertTrue(stats.localRefreshNumber - stats.remoteRefreshNumber > 0);
+        assertTrue(stats.rejectionCount > 0);
         deleteRepo();
     }
 }
diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteRefreshSegmentTracker.java b/server/src/main/java/org/opensearch/index/remote/RemoteRefreshSegmentTracker.java
@@ -325,6 +325,7 @@ void incrementRejectionCount() {
 
     void incrementRejectionCount(String rejectionReason) {
         rejectionCountMap.computeIfAbsent(rejectionReason, k -> new AtomicLong()).incrementAndGet();
+        incrementRejectionCount();
     }
 
     long getRejectionCount(String rejectionReason) {