From efc1ba427b56e40f9cf5a969dc90104c0ccae813 Mon Sep 17 00:00:00 2001 From: Yu-Tang Lin Date: Wed, 16 Aug 2017 00:40:57 +0800 Subject: [PATCH] YARN-6781, remove the map object as second parameter of ResourceUtils.initializeResourcesMap() --- .../java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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..64f7e09 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; } } -- 2.10.0