YARN-7143. FileNotFound handling in ResourceUtils is inconsistent Change-Id: Ib1bb487e14a15edd2b5a42cf5078c5a2b295f069 (cherry picked from commit db82a41d94872cea4d0c1bb1336916cebc2faeec)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/13435f1b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/13435f1b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/13435f1b Branch: refs/heads/YARN-8200 Commit: 13435f1b6937f89db9e8cb5d172497d8cee17b8c Parents: 0f0a423 Author: Daniel Templeton <templ...@apache.org> Authored: Thu Nov 9 10:36:49 2017 -0800 Committer: Konstantin V Shvachko <kshvac...@linkedin.com> Committed: Wed May 2 13:19:58 2018 -0700 ---------------------------------------------------------------------- .../yarn/util/resource/ResourceUtils.java | 52 +++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/13435f1b/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 f3edc74..abf58a6 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 @@ -338,18 +338,14 @@ public class ResourceUtils { if (!initializedResources) { synchronized (ResourceUtils.class) { if (!initializedResources) { - if (conf == null) { - conf = new YarnConfiguration(); - } - try { - addResourcesFileToConf(resourceFile, conf); - LOG.debug("Found " + resourceFile + ", adding to configuration"); - } catch (FileNotFoundException fe) { - LOG.info("Unable to find '" + resourceFile - + "'. Falling back to memory and vcores as resources."); + Configuration resConf = conf; + + if (resConf == null) { + resConf = new YarnConfiguration(); } - initializeResourcesMap(conf); + addResourcesFileToConf(resourceFile, resConf); + initializeResourcesMap(resConf); } } } @@ -386,21 +382,17 @@ public class ResourceUtils { } private static void addResourcesFileToConf(String resourceFile, - Configuration conf) throws FileNotFoundException { + Configuration conf) { try { InputStream ris = getConfInputStream(resourceFile, conf); LOG.debug("Found " + resourceFile + ", adding to configuration"); conf.addResource(ris); } catch (FileNotFoundException fe) { - throw fe; - } catch (IOException ie) { + LOG.info("Unable to find '" + resourceFile + "'."); + } catch (IOException | YarnException ex) { LOG.fatal("Exception trying to read resource types configuration '" - + resourceFile + "'.", ie); - throw new YarnRuntimeException(ie); - } catch (YarnException ye) { - LOG.fatal("YARN Exception trying to read resource types configuration '" - + resourceFile + "'.", ye); - throw new YarnRuntimeException(ye); + + resourceFile + "'.", ex); + throw new YarnRuntimeException(ex); } } @@ -462,19 +454,19 @@ public class ResourceUtils { private static Map<String, ResourceInformation> initializeNodeResourceInformation( Configuration conf) { Map<String, ResourceInformation> nodeResources = new HashMap<>(); - try { - addResourcesFileToConf( - YarnConfiguration.NODE_RESOURCES_CONFIGURATION_FILE, conf); - for (Map.Entry<String, String> entry : conf) { - String key = entry.getKey(); - String value = entry.getValue(); - if (key.startsWith(YarnConfiguration.NM_RESOURCES_PREFIX)) { - addResourceInformation(key, value, nodeResources); - } + + addResourcesFileToConf(YarnConfiguration.NODE_RESOURCES_CONFIGURATION_FILE, + conf); + + for (Map.Entry<String, String> entry : conf) { + String key = entry.getKey(); + String value = entry.getValue(); + + if (key.startsWith(YarnConfiguration.NM_RESOURCES_PREFIX)) { + addResourceInformation(key, value, nodeResources); } - } catch (FileNotFoundException fe) { - LOG.info("Couldn't find node resources file"); } + return nodeResources; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
