Skip to content

Commit f4fb669

Browse files
YARN-7180. Remove class ResourceType. Contributed by Sunil G.
1 parent 0de40f0 commit f4fb669

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceType.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.apache.hadoop.util.StringUtils;
3030
import org.apache.hadoop.yarn.api.records.Resource;
3131
import org.apache.hadoop.yarn.conf.YarnConfiguration;
32-
import org.apache.hadoop.yarn.server.resourcemanager.resource.ResourceType;
3332
import org.apache.hadoop.yarn.server.utils.BuilderUtils;
33+
import org.apache.hadoop.yarn.util.resource.ResourceUtils;
3434
import org.apache.hadoop.yarn.util.resource.Resources;
3535

3636
@Private
@@ -313,11 +313,13 @@ public static ConfigurableResource parseResourceConfigValue(String val)
313313

314314
private static double[] getResourcePercentage(
315315
String val) throws AllocationConfigurationException {
316-
double[] resourcePercentage = new double[ResourceType.values().length];
316+
int numberOfKnownResourceTypes = ResourceUtils
317+
.getNumberOfKnownResourceTypes();
318+
double[] resourcePercentage = new double[numberOfKnownResourceTypes];
317319
String[] strings = val.split(",");
318320
if (strings.length == 1) {
319321
double percentage = findPercentage(strings[0], "");
320-
for (int i = 0; i < ResourceType.values().length; i++) {
322+
for (int i = 0; i < numberOfKnownResourceTypes; i++) {
321323
resourcePercentage[i] = percentage/100;
322324
}
323325
} else {

0 commit comments

Comments
 (0)