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

YARN-4623. TestSystemMetricsPublisher#testPublishAppAttemptMetricsForUnmanagedAM fails with NPE on branch-2.7. Contributed by Naganarasimha G R.

Browse Source
This commit is contained in:
Junping Du 2016-01-21 10:52:15 -08:00
parent 63bb912749
commit 83fd33d5fe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -72,6 +72,9 @@ Release 2.7.3 - UNRELEASED
YARN-4610. Reservations continue looking for one app causes other apps to YARN-4610. Reservations continue looking for one app causes other apps to
starve (jlowe) starve (jlowe)
YARN-4623. TestSystemMetricsPublisher#testPublishAppAttemptMetricsForUnmanagedAM
fails with NPE on branch-2.7. (Naganarasimha G R via junping_du)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java
View File

@ -160,6 +160,8 @@ public void appAttemptRegistered(RMAppAttempt appAttempt,
public void appAttemptFinished(RMAppAttempt appAttempt, public void appAttemptFinished(RMAppAttempt appAttempt,
RMAppAttemptState appAttemtpState, RMApp app, long finishedTime) { RMAppAttemptState appAttemtpState, RMApp app, long finishedTime) {
if (publishSystemMetrics) { if (publishSystemMetrics) {
ContainerId container = (appAttempt.getMasterContainer() == null) ? null
: appAttempt.getMasterContainer().getId();
dispatcher.getEventHandler().handle( dispatcher.getEventHandler().handle(
new AppAttemptFinishedEvent( new AppAttemptFinishedEvent(
appAttempt.getAppAttemptId(), appAttempt.getAppAttemptId(),
@ -171,7 +173,7 @@ public void appAttemptFinished(RMAppAttempt appAttempt,
app.getFinalApplicationStatus(), app.getFinalApplicationStatus(),
RMServerUtils.createApplicationAttemptState(appAttemtpState), RMServerUtils.createApplicationAttemptState(appAttemtpState),
finishedTime, finishedTime,
appAttempt.getMasterContainer().getId())); container));
} }
} }