From 736dcfa9ee3fc7c6e2589468a7121380b429ab16 Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Fri, 4 Oct 2024 13:21:39 -0700 Subject: [PATCH] revise Signed-off-by: Ruirui Zhang --- .../admin/cluster/wlm/TransportWlmStatsAction.java | 2 +- .../action/admin/cluster/wlm/WlmStatsAction.java | 2 +- .../main/java/org/opensearch/wlm/QueryGroupService.java | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/wlm/TransportWlmStatsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/wlm/TransportWlmStatsAction.java index 1f8b48b11ab8e..e86e96715825f 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/wlm/TransportWlmStatsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/wlm/TransportWlmStatsAction.java @@ -29,7 +29,7 @@ */ public class TransportWlmStatsAction extends TransportNodesAction { - QueryGroupService queryGroupService; + final QueryGroupService queryGroupService; @Inject public TransportWlmStatsAction( diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsAction.java index 426ca1bd13708..2dfb10fc5dc90 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsAction.java @@ -17,7 +17,7 @@ */ public class WlmStatsAction extends ActionType { public static final WlmStatsAction INSTANCE = new WlmStatsAction(); - public static final String NAME = "cluster:monitor/query_group_stats"; + public static final String NAME = "cluster:monitor/wlm/stats"; private WlmStatsAction() { super(NAME, WlmStatsResponse::new); diff --git a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java index c37ae6cd4c04a..e5942aac0b4fa 100644 --- a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java +++ b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java @@ -8,6 +8,7 @@ package org.opensearch.wlm; +import org.opensearch.ResourceNotFoundException; import org.opensearch.cluster.metadata.QueryGroup; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -63,7 +64,13 @@ public void incrementFailuresFor(final String queryGroupId) { */ public QueryGroupStats nodeStats(Set queryGroupIds, Boolean requestedBreached) { final Map statsHolderMap = new HashMap<>(); - + if (!queryGroupIds.contains("_all")) { + for (String id : queryGroupIds) { + if (!queryGroupStateMap.containsKey(id)) { + throw new ResourceNotFoundException("QueryGroup with id " + id + " does not exist"); + } + } + } queryGroupStateMap.forEach((queryGroupId, currentState) -> { boolean shouldInclude = (queryGroupIds.size() == 1 && queryGroupIds.contains("_all")) || queryGroupIds.contains(queryGroupId);