Fix org.opensearch.rest.action.admin.cluster.RestNodesStatsActionTest…

…s.testIndexMetricsRequestWithoutIndicesMetric is flaky (#13658) * Fix org.opensearch.rest.action.admin.cluster.RestNodesStatsActionTests.testIndexMetricsRequestWithoutIndicesMetric is flaky Signed-off-by: Gao Binlong <[email protected]> * Change test method name Signed-off-by: Gao Binlong <[email protected]> --------- Signed-off-by: Gao Binlong <[email protected]>
opensearch-project · May 16, 2024 · f30e0e0 · f30e0e0
1 parent f217270
commit f30e0e0
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java
@@ -130,10 +130,12 @@ public void testUnrecognizedIndexMetricDidYouMean() {
         );
     }
 
-    public void testIndexMetricsRequestWithoutIndicesMetric() throws IOException {
+    public void testIndexMetricsRequestWithoutIndicesAndCachesMetrics() throws IOException {
         final HashMap<String, String> params = new HashMap<>();
         final Set<String> metrics = new HashSet<>(RestNodesStatsAction.METRICS.keySet());
         metrics.remove("indices");
+        // caches stats is handled separately
+        metrics.remove("caches");
         params.put("metric", randomSubsetOf(1, metrics).get(0));
         final String indexMetric = randomSubsetOf(1, RestNodesStatsAction.FLAGS.keySet()).get(0);
         params.put("index_metric", indexMetric);
@@ -150,6 +152,19 @@ public void testIndexMetricsRequestWithoutIndicesMetric() throws IOException {
         );
     }
 
+    public void testCacheStatsRequestWithInvalidCacheType() throws IOException {
+        final HashMap<String, String> params = new HashMap<>();
+        params.put("metric", "caches");
+        final String cacheType = randomAlphaOfLength(64);
+        params.put("index_metric", cacheType);
+        final RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withPath("/_nodes/stats").withParams(params).build();
+        final IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> action.prepareRequest(request, mock(NodeClient.class))
+        );
+        assertThat(e, hasToString(containsString("request [/_nodes/stats] contains unrecognized cache type: [" + cacheType + "]")));
+    }
+
     public void testIndexMetricsRequestOnAllRequest() throws IOException {
         final HashMap<String, String> params = new HashMap<>();
         params.put("metric", "_all");