From f59873e3b368156d9b11f8d3ecfc19b1044eaafd Mon Sep 17 00:00:00 2001 From: Yu-Tang Lin Date: Thu, 17 Aug 2017 00:13:30 +0800 Subject: [PATCH] YARN-6781, remove the map object as second parameter of ResourceUtils.initializeResourcesMap(), and modify the related test cases --- .../apache/hadoop/yarn/util/resource/ResourceUtils.java | 14 +++++++------- .../hadoop/yarn/util/resource/TestResourceUtils.java | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java index 49feafa..ec771f9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java @@ -200,9 +200,9 @@ private static void setMaximumAllocationForMandatoryResources( } @VisibleForTesting - static void initializeResourcesMap(Configuration conf, - Map resourceInformationMap) { + static void initializeResourcesMap(Configuration conf) { + Map resourceInformationMap = new HashMap<>(); String[] resourceNames = conf.getStrings(YarnConfiguration.RESOURCE_TYPES); if (resourceNames != null && resourceNames.length != 0) { @@ -328,19 +328,18 @@ private static void updateResourceTypeIndex() { if (!initializedResources) { synchronized (ResourceUtils.class) { if (!initializedResources) { - Map resources = new HashMap<>(); if (conf == null) { conf = new YarnConfiguration(); } try { addResourcesFileToConf(resourceFile, conf); LOG.debug("Found " + resourceFile + ", adding to configuration"); - initializeResourcesMap(conf, resources); + initializeResourcesMap(conf); initializedResources = true; } catch (FileNotFoundException fe) { LOG.info("Unable to find '" + resourceFile + "'. Falling back to memory and vcores as resources", fe); - initializeResourcesMap(conf, resources); + initializeResourcesMap(conf); initializedResources = true; } } @@ -397,11 +396,12 @@ synchronized static void resetResourceTypes() { } @VisibleForTesting - public static void resetResourceTypes(Configuration conf) { + public static Map + resetResourceTypes(Configuration conf) { synchronized (ResourceUtils.class) { initializedResources = false; } - getResourceTypes(conf); + return getResourceTypes(conf); } public static String getUnits(String resourceValue) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java index b530150..0231198 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java @@ -183,8 +183,9 @@ public void testInitializeResourcesMap() throws Exception { YarnConfiguration.RESOURCE_TYPES + "." + resources[0] + ".units"; conf.set(name, resources[1]); } - Map ret = new HashMap<>(); - ResourceUtils.initializeResourcesMap(conf, ret); + Map ret = + ResourceUtils.resetResourceTypes(conf); + // for test1, 4 - length will be 1, 4 // for the others, len will be 3 int len = 3; @@ -248,9 +249,8 @@ public void testInitializeResourcesMapErrors() throws Exception { YarnConfiguration.RESOURCE_TYPES + "." + resources[0] + ".units"; conf.set(name, resources[1]); } - Map ret = new HashMap<>(); try { - ResourceUtils.initializeResourcesMap(conf, ret); + ResourceUtils.initializeResourcesMap(conf); Assert.fail("resource map initialization should fail"); } catch (Exception e) { // do nothing -- 2.10.0