Skip to content

Commit

Permalink
rename a util class
Browse files Browse the repository at this point in the history
Signed-off-by: Kaushal Kumar <[email protected]>
  • Loading branch information
kaushalmahi12 committed Sep 6, 2024
1 parent 8aede33 commit 623f6f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions server/src/main/java/org/opensearch/wlm/ResourceType.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.wlm.tracker.CpuUsageCalculator;
import org.opensearch.wlm.tracker.MemoryUsageCalculator;
import org.opensearch.wlm.tracker.QueryGroupUsage;
import org.opensearch.wlm.tracker.ResourceUsageCalculator;
import org.opensearch.wlm.tracker.ResourceUsageUtil;

import java.io.IOException;
import java.util.List;
Expand All @@ -27,13 +27,13 @@
*/
@PublicApi(since = "2.17.0")
public enum ResourceType {
CPU("cpu", true, CpuUsageCalculator.INSTANCE, new ResourceUsageUtil() {
CPU("cpu", true, CpuUsageCalculator.INSTANCE, new QueryGroupUsage() {
@Override
protected double getNormalisedThreshold(QueryGroup queryGroup) {
return queryGroup.getResourceLimits().get(ResourceType.CPU) * getSettings().getNodeLevelCpuCancellationThreshold();
}
}),
MEMORY("memory", true, MemoryUsageCalculator.INSTANCE, new ResourceUsageUtil() {
MEMORY("memory", true, MemoryUsageCalculator.INSTANCE, new QueryGroupUsage() {
@Override
protected double getNormalisedThreshold(QueryGroup queryGroup) {
return queryGroup.getResourceLimits().get(ResourceType.MEMORY) * getSettings().getNodeLevelMemoryCancellationThreshold();
Expand All @@ -43,14 +43,14 @@ protected double getNormalisedThreshold(QueryGroup queryGroup) {
private final String name;
private final boolean statsEnabled;
private final ResourceUsageCalculator resourceUsageCalculator;
private final ResourceUsageUtil resourceUsageUtil;
private final QueryGroupUsage queryGroupUsage;
private static List<ResourceType> sortedValues = List.of(CPU, MEMORY);

ResourceType(String name, boolean statsEnabled, ResourceUsageCalculator resourceUsageCalculator, ResourceUsageUtil resourceUsageUtil) {
ResourceType(String name, boolean statsEnabled, ResourceUsageCalculator resourceUsageCalculator, QueryGroupUsage queryGroupUsage) {
this.name = name;
this.statsEnabled = statsEnabled;
this.resourceUsageCalculator = resourceUsageCalculator;
this.resourceUsageUtil = resourceUsageUtil;
this.queryGroupUsage = queryGroupUsage;
}

/**
Expand Down Expand Up @@ -92,11 +92,11 @@ public boolean isBreachingThreshold(QueryGroup queryGroup, double currentUsage)
}

public double getExcessUsage(QueryGroup queryGroup, double currentUsage) {
return resourceUsageUtil.getExcessUsage(queryGroup, currentUsage);
return queryGroupUsage.getExcessUsage(queryGroup, currentUsage);
}

public void setWorkloadManagementSettings(WorkloadManagementSettings settings) {
resourceUsageUtil.setSettings(settings);
queryGroupUsage.setSettings(settings);
}

public static List<ResourceType> getSortedValues() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* Utility class to provide utility methods at query group level
*/
public abstract class ResourceUsageUtil {
public abstract class QueryGroupUsage {
private WorkloadManagementSettings settings;

public WorkloadManagementSettings getSettings() {
Expand Down

0 comments on commit 623f6f8

Please sign in to comment.