YARN-6935. [YARN-3926] ResourceProfilesManagerImpl.parseResource() has no need of the key parameter (Contributed by Manikandan R via Daniel Templeton)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb7c9b7b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb7c9b7b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb7c9b7b Branch: refs/heads/YARN-3926 Commit: eb7c9b7bf01db652ec64c39e4ec868eaa5c59547 Parents: f84812c Author: Daniel Templeton <templ...@apache.org> Authored: Fri Aug 11 16:32:13 2017 -0700 Committer: Sunil G <sun...@apache.org> Committed: Wed Aug 16 23:35:23 2017 +0530 ---------------------------------------------------------------------- .../resource/ResourceProfilesManagerImpl.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb7c9b7b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java index ab33336..b5ab384 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java @@ -87,22 +87,22 @@ public class ResourceProfilesManagerImpl implements ResourceProfilesManager { Iterator iterator = data.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry entry = (Map.Entry) iterator.next(); - String key = entry.getKey().toString(); - if (key.isEmpty()) { + String profileName = entry.getKey().toString(); + if (profileName.isEmpty()) { throw new IOException( "Name of resource profile cannot be an empty string"); } if (entry.getValue() instanceof Map) { - Map value = (Map) entry.getValue(); + Map profileInfo = (Map) entry.getValue(); // ensure memory and vcores are specified - if (!value.containsKey(MEMORY) || !value.containsKey(VCORES)) { + if (!profileInfo.containsKey(MEMORY) || !profileInfo.containsKey(VCORES)) { throw new IOException( - "Illegal resource profile definition; profile '" + key + "Illegal resource profile definition; profile '" + profileName + "' must contain '" + MEMORY + "' and '" + VCORES + "'"); } - Resource resource = parseResource(key, value); - profiles.put(key, resource); - LOG.info("Added profile '" + key + "' with resources " + resource); + Resource resource = parseResource(profileInfo); + profiles.put(profileName, resource); + LOG.info("Added profile '" + profileName + "' with resources " + resource); } } // check to make sure mandatory profiles are present @@ -116,9 +116,9 @@ public class ResourceProfilesManagerImpl implements ResourceProfilesManager { LOG.info("Loaded profiles " + profiles.keySet()); } - private Resource parseResource(String key, Map value) throws IOException { + private Resource parseResource(Map profileInfo) throws IOException { Resource resource = Resource.newInstance(0, 0); - Iterator iterator = value.entrySet().iterator(); + Iterator iterator = profileInfo.entrySet().iterator(); Map<String, ResourceInformation> resourceTypes = ResourceUtils .getResourceTypes(); while (iterator.hasNext()) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
