Repository: hadoop Updated Branches: refs/heads/branch-2 0b428075a -> 528ef2407
YARN-5873. RM crashes with NPE if generic application history is enabled. Contributed by Varun Saxena. (cherry picked from commit 296c5de0cfee88389cf9f90263280b2034e54cd5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fad6de30 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fad6de30 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fad6de30 Branch: refs/heads/branch-2 Commit: fad6de30806521f3cb4cdbc65f1ccb79d46acc00 Parents: 0b42807 Author: Rohith Sharma K S <[email protected]> Authored: Tue Nov 15 10:56:28 2016 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Tue Nov 15 11:03:27 2016 +0530 ---------------------------------------------------------------------- .../server/resourcemanager/rmcontainer/RMContainerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fad6de30/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.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/rmcontainer/RMContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java index 138b45c..10081b4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java @@ -247,7 +247,9 @@ public class RMContainerImpl implements RMContainer, Comparable<RMContainer> { YarnConfiguration .DEFAULT_APPLICATION_HISTORY_SAVE_NON_AM_CONTAINER_META_INFO); - rmContext.getRMApplicationHistoryWriter().containerStarted(this); + if (container.getId() != null) { + rmContext.getRMApplicationHistoryWriter().containerStarted(this); + } // If saveNonAMContainerMetaInfo is true, store system metrics for all // containers. If false, and if this container is marked as the AM, metrics @@ -893,6 +895,9 @@ public class RMContainerImpl implements RMContainer, Comparable<RMContainer> { // container creation event to timeline service when id assigned. container.setId(containerId); + if (containerId != null) { + rmContext.getRMApplicationHistoryWriter().containerStarted(this); + } // If saveNonAMContainerMetaInfo is true, store system metrics for all // containers. If false, and if this container is marked as the AM, metrics // will still be published for this container, but that calculation happens --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
