YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit. (tangshangwen via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9e36dea Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9e36dea Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9e36dea Branch: refs/heads/HDFS-1312 Commit: f9e36dea96f592d09f159e521379e426e7f07ec9 Parents: 4e4b3a8 Author: Rohith Sharma K S <[email protected]> Authored: Mon Jan 4 09:58:13 2016 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Mon Jan 4 09:58:13 2016 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/localizer/ResourceLocalizationService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9e36dea/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4a8c615..80a3ed1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -99,6 +99,9 @@ Release 2.9.0 - UNRELEASED YARN-2934. Improve handling of container's stderr. (Naganarasimha G R via gera) + YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit + (tangshangwen via rohithsharmaks) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9e36dea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index 5db5145..c0c2e8e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -878,12 +878,12 @@ public class ResourceLocalizationService extends CompositeService Future<Path> completed = queue.take(); LocalizerResourceRequestEvent assoc = pending.remove(completed); try { - Path local = completed.get(); if (null == assoc) { LOG.error("Localized unknown resource to " + completed); // TODO delete return; } + Path local = completed.get(); LocalResourceRequest key = assoc.getResource().getRequest(); publicRsrc.handle(new ResourceLocalizedEvent(key, local, FileUtil .getDU(new File(local.toUri()))));
