diff --git a/server/src/main/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerService.java b/server/src/main/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerService.java index d25d6281a8670..89d7e18f01c65 100644 --- a/server/src/main/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerService.java +++ b/server/src/main/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerService.java @@ -28,20 +28,14 @@ public class QueryGroupResourceUsageTrackerService implements TaskManager.TaskEventListeners { public static final List TRACKED_RESOURCES = List.of(ResourceType.MEMORY, ResourceType.CPU); - private final TaskManager taskManager; private final TaskResourceTrackingService taskResourceTrackingService; /** * QueryGroupResourceTrackerService constructor * - * @param taskManager Task Manager service for keeping track of currently running tasks on the nodes * @param taskResourceTrackingService Service that helps track resource usage of tasks running on a node. */ - public QueryGroupResourceUsageTrackerService( - final TaskManager taskManager, - final TaskResourceTrackingService taskResourceTrackingService - ) { - this.taskManager = taskManager; + public QueryGroupResourceUsageTrackerService(TaskResourceTrackingService taskResourceTrackingService) { this.taskResourceTrackingService = taskResourceTrackingService; } diff --git a/server/src/test/java/org/opensearch/wlm/tracking/QueryGroupResourceUsageTrackerServiceTests.java b/server/src/test/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerServiceTests.java similarity index 93% rename from server/src/test/java/org/opensearch/wlm/tracking/QueryGroupResourceUsageTrackerServiceTests.java rename to server/src/test/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerServiceTests.java index 1c1893c4cef37..6702a3948eb0e 100644 --- a/server/src/test/java/org/opensearch/wlm/tracking/QueryGroupResourceUsageTrackerServiceTests.java +++ b/server/src/test/java/org/opensearch/wlm/tracker/QueryGroupResourceUsageTrackerServiceTests.java @@ -6,28 +6,24 @@ * compatible open source license. */ -package org.opensearch.wlm.tracking; +package org.opensearch.wlm.tracker; import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchTask; -import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.tasks.resourcetracker.TaskResourceUsage; import org.opensearch.search.ResourceType; import org.opensearch.tasks.CancellableTask; import org.opensearch.tasks.Task; -import org.opensearch.tasks.TaskManager; import org.opensearch.tasks.TaskResourceTrackingService; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.wlm.QueryGroupLevelResourceUsageView; import org.opensearch.wlm.QueryGroupTask; -import org.opensearch.wlm.tracker.QueryGroupResourceUsageTrackerService; import org.junit.After; import org.junit.Before; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,16 +38,14 @@ public class QueryGroupResourceUsageTrackerServiceTests extends OpenSearchTestCase { TestThreadPool threadPool; - TaskManager taskManager; TaskResourceTrackingService mockTaskResourceTrackingService; QueryGroupResourceUsageTrackerService queryGroupResourceUsageTrackerService; @Before public void setup() { threadPool = new TestThreadPool(getTestName()); - taskManager = new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet()); mockTaskResourceTrackingService = mock(TaskResourceTrackingService.class); - queryGroupResourceUsageTrackerService = new QueryGroupResourceUsageTrackerService(taskManager, mockTaskResourceTrackingService); + queryGroupResourceUsageTrackerService = new QueryGroupResourceUsageTrackerService(mockTaskResourceTrackingService); } @After