From 623078a6a5db26b9e85a6972f4ae21e93b4b905f Mon Sep 17 00:00:00 2001 From: Kaushal Kumar Date: Mon, 7 Oct 2024 15:33:50 -0700 Subject: [PATCH] replace StateApplier with StateListener interface Signed-off-by: Kaushal Kumar --- .../main/java/org/opensearch/wlm/QueryGroupService.java | 8 ++++---- .../java/org/opensearch/wlm/QueryGroupServiceTests.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java index 03df6b9f456b0..cda5916db26f3 100644 --- a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java +++ b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.SearchShardTask; import org.opensearch.cluster.ClusterChangedEvent; -import org.opensearch.cluster.ClusterStateApplier; +import org.opensearch.cluster.ClusterStateListener; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.metadata.QueryGroup; import org.opensearch.cluster.service.ClusterService; @@ -45,7 +45,7 @@ */ public class QueryGroupService extends AbstractLifecycleComponent implements - ClusterStateApplier, + ClusterStateListener, TaskResourceTrackingService.TaskCompletionListener { private static final Logger logger = LogManager.getLogger(QueryGroupService.class); @@ -116,7 +116,7 @@ public QueryGroupService( this.queryGroupsStateAccessor = queryGroupsStateAccessor; activeQueryGroups.forEach(queryGroup -> this.queryGroupsStateAccessor.addNewQueryGroup(queryGroup.get_id())); this.queryGroupsStateAccessor.addNewQueryGroup(QueryGroupTask.DEFAULT_QUERY_GROUP_ID_SUPPLIER.get()); - clusterService.addStateApplier(this); + this.clusterService.addListener(this); } /** @@ -155,7 +155,7 @@ protected void doStop() { protected void doClose() throws IOException {} @Override - public void applyClusterState(ClusterChangedEvent event) { + public void clusterChanged(ClusterChangedEvent event) { // Retrieve the current and previous cluster states Metadata previousMetadata = event.previousState().metadata(); Metadata currentMetadata = event.state().metadata(); diff --git a/server/src/test/java/org/opensearch/wlm/QueryGroupServiceTests.java b/server/src/test/java/org/opensearch/wlm/QueryGroupServiceTests.java index 9c59cf62b85c1..c5cf0dac4f807 100644 --- a/server/src/test/java/org/opensearch/wlm/QueryGroupServiceTests.java +++ b/server/src/test/java/org/opensearch/wlm/QueryGroupServiceTests.java @@ -86,7 +86,7 @@ public void tearDown() throws Exception { mockThreadPool.shutdown(); } - public void testApplyClusterState() { + public void testClusterChanged() { ClusterChangedEvent mockClusterChangedEvent = Mockito.mock(ClusterChangedEvent.class); ClusterState mockPreviousClusterState = Mockito.mock(ClusterState.class); ClusterState mockClusterState = Mockito.mock(ClusterState.class); @@ -115,7 +115,7 @@ public void testApplyClusterState() { when(mockClusterState.metadata()).thenReturn(mockMetadata); when(mockPreviousMetadata.queryGroups()).thenReturn(previousQueryGroups); when(mockMetadata.queryGroups()).thenReturn(currentQueryGroups); - queryGroupService.applyClusterState(mockClusterChangedEvent); + queryGroupService.clusterChanged(mockClusterChangedEvent); Set currentQueryGroupsExpected = Set.of(currentQueryGroups.get("4241")); Set previousQueryGroupsExpected = Set.of(previousQueryGroups.get("4242"));