cleanups

Signed-off-by: Kiran Prakash <[email protected]>
kiranprakash154 · Aug 1, 2024 · 1cf2d31 · 1cf2d31
1 parent e6925cb
commit 1cf2d31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git 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<ResourceType> 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/...roupResourceUsageTrackerServiceTests.java → ...roupResourceUsageTrackerServiceTests.java b/...roupResourceUsageTrackerServiceTests.java → ...roupResourceUsageTrackerServiceTests.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