YARN-6781. [YARN-3926] ResourceUtils#initializeResourcesMap takes an unnecessary Map parameter. Contributed by Yu-Tang Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f461a2d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f461a2d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f461a2d4 Branch: refs/heads/YARN-3926 Commit: f461a2d420b1af204b79b52c555d51e447452efc Parents: 176e5c8 Author: Sunil G <sun...@apache.org> Authored: Fri Aug 18 19:00:49 2017 +0530 Committer: Wangda Tan <wan...@apache.org> Committed: Mon Aug 21 16:56:02 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/util/resource/ResourceUtils.java | 14 +++++++------- .../hadoop/yarn/util/resource/TestResourceUtils.java | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f461a2d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java ---------------------------------------------------------------------- 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 5ed5712..997c2c0 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 @@ -201,9 +201,9 @@ public class ResourceUtils { } @VisibleForTesting - static void initializeResourcesMap(Configuration conf, - Map<String, ResourceInformation> resourceInformationMap) { + static void initializeResourcesMap(Configuration conf) { + Map<String, ResourceInformation> resourceInformationMap = new HashMap<>(); String[] resourceNames = conf.getStrings(YarnConfiguration.RESOURCE_TYPES); if (resourceNames != null && resourceNames.length != 0) { @@ -339,19 +339,18 @@ public class ResourceUtils { if (!initializedResources) { synchronized (ResourceUtils.class) { if (!initializedResources) { - Map<String, ResourceInformation> 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; } } @@ -414,11 +413,12 @@ public class ResourceUtils { } @VisibleForTesting - public static void resetResourceTypes(Configuration conf) { + public static Map<String, ResourceInformation> + resetResourceTypes(Configuration conf) { synchronized (ResourceUtils.class) { initializedResources = false; } - getResourceTypes(conf); + return getResourceTypes(conf); } public static String getUnits(String resourceValue) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/f461a2d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java ---------------------------------------------------------------------- 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..4e4671a 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 class TestResourceUtils { YarnConfiguration.RESOURCE_TYPES + "." + resources[0] + ".units"; conf.set(name, resources[1]); } - Map<String, ResourceInformation> ret = new HashMap<>(); - ResourceUtils.initializeResourcesMap(conf, ret); + Map<String, ResourceInformation> 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 class TestResourceUtils { YarnConfiguration.RESOURCE_TYPES + "." + resources[0] + ".units"; conf.set(name, resources[1]); } - Map<String, ResourceInformation> ret = new HashMap<>(); try { - ResourceUtils.initializeResourcesMap(conf, ret); + ResourceUtils.initializeResourcesMap(conf); Assert.fail("resource map initialization should fail"); } catch (Exception e) { // do nothing --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
