Revert "[Backport 2.x] add query group stats constructs"

CHANGELOG.md

@@ -28,7 +28,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add support for index level max slice count setting for concurrent segment search ([#15336](https://github.com/opensearch-project/OpenSearch/pull/15336))
 - [Streaming Indexing] Introduce bulk HTTP API streaming flavor ([#15381](https://github.com/opensearch-project/OpenSearch/pull/15381))
 - Add concurrent search support for Derived Fields ([#15326](https://github.com/opensearch-project/OpenSearch/pull/15326))
-- [Workload Management] Add query group stats constructs ([#15343](https://github.com/opensearch-project/OpenSearch/pull/15343)))
 
 ### Dependencies
 - Bump `netty` from 4.1.111.Final to 4.1.112.Final ([#15081](https://github.com/opensearch-project/OpenSearch/pull/15081))

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceService.java

@@ -29,7 +29,7 @@
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.plugin.wlm.action.CreateQueryGroupResponse;
 import org.opensearch.plugin.wlm.action.DeleteQueryGroupRequest;
-import org.opensearch.wlm.ResourceType;
+import org.opensearch.search.ResourceType;
 
 import java.util.Collection;
 import java.util.EnumMap;

plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/QueryGroupTestUtils.java

@@ -31,7 +31,7 @@
 import java.util.Set;
 
 import static org.opensearch.cluster.metadata.QueryGroup.builder;
-import static org.opensearch.wlm.ResourceType.fromName;
+import static org.opensearch.search.ResourceType.fromName;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceServiceTests.java

@@ -24,9 +24,9 @@
 import org.opensearch.plugin.wlm.QueryGroupTestUtils;
 import org.opensearch.plugin.wlm.action.CreateQueryGroupResponse;
 import org.opensearch.plugin.wlm.action.DeleteQueryGroupRequest;
+import org.opensearch.search.ResourceType;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.wlm.ResourceType;
 
 import java.util.ArrayList;
 import java.util.Collection;

server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java

@@ -17,7 +17,7 @@
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.wlm.ResourceType;
+import org.opensearch.search.ResourceType;
 import org.joda.time.Instant;
 
 import java.io.IOException;

server/src/main/java/org/opensearch/wlm/ResourceType.java → server/src/main/java/org/opensearch/search/ResourceType.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.wlm;
+package org.opensearch.search;
 
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -21,17 +21,15 @@
  */
 @PublicApi(since = "2.x")
 public enum ResourceType {
-    CPU("cpu", task -> task.getTotalResourceUtilization(ResourceStats.CPU), true),
-    MEMORY("memory", task -> task.getTotalResourceUtilization(ResourceStats.MEMORY), true);
+    CPU("cpu", task -> task.getTotalResourceUtilization(ResourceStats.CPU)),
+    MEMORY("memory", task -> task.getTotalResourceUtilization(ResourceStats.MEMORY));
 
     private final String name;
     private final Function<Task, Long> getResourceUsage;
-    private final boolean statsEnabled;
 
-    ResourceType(String name, Function<Task, Long> getResourceUsage, boolean statsEnabled) {
+    ResourceType(String name, Function<Task, Long> getResourceUsage) {
         this.name = name;
         this.getResourceUsage = getResourceUsage;
-        this.statsEnabled = statsEnabled;
     }
 
     /**
@@ -65,8 +63,4 @@ public String getName() {
     public long getResourceUsage(Task task) {
         return getResourceUsage.apply(task);
     }
-
-    public boolean hasStatsEnabled() {
-        return statsEnabled;
-    }
 }

server/src/main/java/org/opensearch/search/backpressure/SearchBackpressureService.java

@@ -18,6 +18,7 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.monitor.jvm.JvmStats;
 import org.opensearch.monitor.process.ProcessProbe;
+import org.opensearch.search.ResourceType;
 import org.opensearch.search.backpressure.settings.SearchBackpressureMode;
 import org.opensearch.search.backpressure.settings.SearchBackpressureSettings;
 import org.opensearch.search.backpressure.settings.SearchShardTaskSettings;
@@ -42,7 +43,6 @@
 import org.opensearch.tasks.TaskResourceTrackingService.TaskCompletionListener;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;
-import org.opensearch.wlm.ResourceType;
 
 import java.io.IOException;
 import java.util.ArrayList;

server/src/main/java/org/opensearch/search/backpressure/trackers/NodeDuressTrackers.java

@@ -9,7 +9,7 @@
 package org.opensearch.search.backpressure.trackers;
 
 import org.opensearch.common.util.Streak;
-import org.opensearch.wlm.ResourceType;
+import org.opensearch.search.ResourceType;
 
 import java.util.Map;
 import java.util.function.BooleanSupplier;

server/src/main/java/org/opensearch/wlm/QueryGroupLevelResourceUsageView.java

@@ -8,6 +8,7 @@
 
 package org.opensearch.wlm;
 
+import org.opensearch.search.ResourceType;
 import org.opensearch.tasks.Task;
 
 import java.util.List;