Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-5873. RM crashes with NPE if generic application history is enabled. Contributed by Varun Saxena. 

(cherry picked from commit 296c5de0cf)
This commit is contained in:
Rohith Sharma K S 2016-11-15 10:56:28 +05:30
parent 0b428075a2
commit fad6de3080
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java
View File

@ -247,7 +247,9 @@ public class RMContainerImpl implements RMContainer, Comparable<RMContainer> {
YarnConfiguration YarnConfiguration
.DEFAULT_APPLICATION_HISTORY_SAVE_NON_AM_CONTAINER_META_INFO); .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 // If saveNonAMContainerMetaInfo is true, store system metrics for all
// containers. If false, and if this container is marked as the AM, metrics // 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 creation event to timeline service when id assigned.
container.setId(containerId); container.setId(containerId);
if (containerId != null) {
rmContext.getRMApplicationHistoryWriter().containerStarted(this);
}
// If saveNonAMContainerMetaInfo is true, store system metrics for all // If saveNonAMContainerMetaInfo is true, store system metrics for all
// containers. If false, and if this container is marked as the AM, metrics // containers. If false, and if this container is marked as the AM, metrics
// will still be published for this container, but that calculation happens // will still be published for this container, but that calculation happens