Repository: hadoop Updated Branches: refs/heads/branch-2.7 63bb91274 -> 83fd33d5f
YARN-4623. TestSystemMetricsPublisher#testPublishAppAttemptMetricsForUnmanagedAM fails with NPE on branch-2.7. Contributed by Naganarasimha G R. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/83fd33d5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83fd33d5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83fd33d5 Branch: refs/heads/branch-2.7 Commit: 83fd33d5fe847b1daa2d8e8e98329484a02078f3 Parents: 63bb912 Author: Junping Du <[email protected]> Authored: Thu Jan 21 10:52:15 2016 -0800 Committer: Junping Du <[email protected]> Committed: Thu Jan 21 10:54:32 2016 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/metrics/SystemMetricsPublisher.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/83fd33d5/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0f869e2..0b6b5ae 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -72,6 +72,9 @@ Release 2.7.3 - UNRELEASED YARN-4610. Reservations continue looking for one app causes other apps to starve (jlowe) + YARN-4623. TestSystemMetricsPublisher#testPublishAppAttemptMetricsForUnmanagedAM + fails with NPE on branch-2.7. (Naganarasimha G R via junping_du) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/83fd33d5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.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/metrics/SystemMetricsPublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java index fbb4a8a..5cb8a3c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/SystemMetricsPublisher.java @@ -160,6 +160,8 @@ public class SystemMetricsPublisher extends CompositeService { public void appAttemptFinished(RMAppAttempt appAttempt, RMAppAttemptState appAttemtpState, RMApp app, long finishedTime) { if (publishSystemMetrics) { + ContainerId container = (appAttempt.getMasterContainer() == null) ? null + : appAttempt.getMasterContainer().getId(); dispatcher.getEventHandler().handle( new AppAttemptFinishedEvent( appAttempt.getAppAttemptId(), @@ -171,7 +173,7 @@ public class SystemMetricsPublisher extends CompositeService { app.getFinalApplicationStatus(), RMServerUtils.createApplicationAttemptState(appAttemtpState), finishedTime, - appAttempt.getMasterContainer().getId())); + container)); } }
