Fixed reset impl for multi dim stats

Signed-off-by: Peter Alfonsi <[email protected]>
peteralfonsi · Mar 1, 2024 · 60df761 · 60df761
1 parent 2aeaa53
commit 60df761
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/server/src/main/java/org/opensearch/common/cache/stats/MultiDimensionCacheStats.java b/server/src/main/java/org/opensearch/common/cache/stats/MultiDimensionCacheStats.java
@@ -233,6 +233,8 @@ public void reset() {
             response.memorySize.dec(response.getMemorySize());
             response.entries.dec(response.getEntries());
         }
+        totalStats.memorySize.dec(totalStats.getMemorySize());
+        totalStats.entries.dec(totalStats.getEntries());
     }
 
     private CacheStatsResponse internalGetStats(List<CacheStatsDimension> dimensions) {

diff --git a/server/src/test/java/org/opensearch/common/cache/stats/MultiDimensionCacheStatsTests.java b/server/src/test/java/org/opensearch/common/cache/stats/MultiDimensionCacheStatsTests.java
@@ -11,6 +11,7 @@
 import org.opensearch.common.Randomness;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.metrics.CounterMetric;
+import org.opensearch.common.recycler.Recycler;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.common.io.stream.BytesStreamInput;
 import org.opensearch.test.OpenSearchTestCase;
@@ -189,6 +190,20 @@ public void testReset() throws Exception {
             assertEquals(originalResponse.getMemorySize(), stats.getMemorySizeByDimensions(dims));
             assertEquals(originalResponse.getEntries(), stats.getEntriesByDimensions(dims));
         }
+
+        CacheStatsResponse expectedTotal = new CacheStatsResponse();
+        for (Set<CacheStatsDimension> dimSet : expected.keySet()) {
+            expectedTotal.add(expected.get(dimSet));
+        }
+        expectedTotal.memorySize = new CounterMetric();
+        expectedTotal.entries = new CounterMetric();
+        assertEquals(expectedTotal, stats.getTotalStats());
+
+        assertEquals(expectedTotal.getHits(), stats.getTotalHits());
+        assertEquals(expectedTotal.getMisses(), stats.getTotalMisses());
+        assertEquals(expectedTotal.getEvictions(), stats.getTotalEvictions());
+        assertEquals(expectedTotal.getMemorySize(), stats.getTotalMemorySize());
+        assertEquals(expectedTotal.getEntries(), stats.getTotalEntries());
     }
 
     private Map<String, List<String>> getUsedDimensionValues(MultiDimensionCacheStats stats, int numValuesPerDim) {