YARN-4452. NPE when submit Unmanaged application. Contributed by Naganarasimha
G R.
(cherry picked from commit 50bd067e1d63d4c80dc1e7bf4024bfaf42cf4416)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/435b6ae8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/435b6ae8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/435b6ae8
Branch: refs/heads/branch-2.8
Commit: 435b6ae82b7c8b5fb3e8ea830a6972f03b3b8cf6
Parents: a025b7b
Author: Jason Lowe <jl...@apache.org>
Authored: Mon Jan 25 16:11:59 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Jan 25 16:11:59 2016 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 9 ++++++
.../metrics/SystemMetricsPublisher.java | 22 ++++++++-----
.../metrics/TestSystemMetricsPublisher.java | 34 ++++++++++++++++----
3 files changed, 51 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/435b6ae8/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bde7e67..c828d32 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1100,6 +1100,9 @@ Release 2.8.0 - UNRELEASED
YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with
bind exception. (Brahma Reddy Battula via jianhe)
+ YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R
+ via junping_du)
+
YARN-4392. ApplicationCreatedEvent event time resets after RM
restart/failover.
(Naganarasimha G R and Xuan Gong via xgong)
@@ -1211,6 +1214,9 @@ Release 2.7.3 - UNRELEASED
YARN-4439. Clarify NMContainerStatus#toString method. (Jian He via xgong)
+ YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R via
+ junping_du)
+
YARN-4398. Remove unnecessary synchronization in RMStateStore. (Ning Ding
via jianhe)
YARN-4422. Generic AHS sometimes doesn't show started, node, or logs on
App page
@@ -2092,6 +2098,9 @@ Release 2.6.4 - UNRELEASED
BUG FIXES
+ YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R
+ via junping_du)
+
YARN-4546. ResourceManager crash due to scheduling opportunity overflow.
(Jason Lowe via junping_du)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/435b6ae8/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 2c6349c..84a3b19 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
@@ -161,6 +161,8 @@ public class SystemMetricsPublisher extends
CompositeService {
public void appAttemptRegistered(RMAppAttempt appAttempt,
long registeredTime) {
if (publishSystemMetrics) {
+ ContainerId container = (appAttempt.getMasterContainer() == null) ? null
+ : appAttempt.getMasterContainer().getId();
dispatcher.getEventHandler().handle(
new AppAttemptRegisteredEvent(
appAttempt.getAppAttemptId(),
@@ -168,7 +170,7 @@ public class SystemMetricsPublisher extends
CompositeService {
appAttempt.getRpcPort(),
appAttempt.getTrackingUrl(),
appAttempt.getOriginalTrackingUrl(),
- appAttempt.getMasterContainer().getId(),
+ container,
registeredTime));
}
}
@@ -177,6 +179,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(),
@@ -188,7 +192,7 @@ public class SystemMetricsPublisher extends
CompositeService {
app.getFinalApplicationStatus(),
RMServerUtils.createApplicationAttemptState(appAttemtpState),
finishedTime,
- appAttempt.getMasterContainer().getId()));
+ container));
}
}
@@ -391,9 +395,10 @@ public class SystemMetricsPublisher extends
CompositeService {
event.getHost());
eventInfo.put(AppAttemptMetricsConstants.RPC_PORT_EVENT_INFO,
event.getRpcPort());
- eventInfo.put(
- AppAttemptMetricsConstants.MASTER_CONTAINER_EVENT_INFO,
- event.getMasterContainerId().toString());
+ if (event.getMasterContainerId() != null) {
+ eventInfo.put(AppAttemptMetricsConstants.MASTER_CONTAINER_EVENT_INFO,
+ event.getMasterContainerId().toString());
+ }
tEvent.setEventInfo(eventInfo);
entity.addEvent(tEvent);
putEntity(entity);
@@ -418,9 +423,10 @@ public class SystemMetricsPublisher extends
CompositeService {
event.getFinalApplicationStatus().toString());
eventInfo.put(AppAttemptMetricsConstants.STATE_EVENT_INFO,
event.getYarnApplicationAttemptState().toString());
- eventInfo.put(
- AppAttemptMetricsConstants.MASTER_CONTAINER_EVENT_INFO,
- event.getMasterContainerId().toString());
+ if (event.getMasterContainerId() != null) {
+ eventInfo.put(AppAttemptMetricsConstants.MASTER_CONTAINER_EVENT_INFO,
+ event.getMasterContainerId().toString());
+ }
tEvent.setEventInfo(eventInfo);
entity.addEvent(tEvent);
putEntity(entity);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/435b6ae8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
index 4835ade..f2b02bc 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
@@ -257,10 +257,30 @@ public class TestSystemMetricsPublisher {
}
@Test(timeout = 10000)
+ public void testPublishAppAttemptMetricsForUnmanagedAM() throws Exception {
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1);
+ RMAppAttempt appAttempt = createRMAppAttempt(appAttemptId,true);
+ metricsPublisher.appAttemptRegistered(appAttempt, Integer.MAX_VALUE + 1L);
+ RMApp app = mock(RMApp.class);
+
when(app.getFinalApplicationStatus()).thenReturn(FinalApplicationStatus.UNDEFINED);
+ metricsPublisher.appAttemptFinished(appAttempt,
RMAppAttemptState.FINISHED, app,
+ Integer.MAX_VALUE + 2L);
+ TimelineEntity entity = null;
+ do {
+ entity =
+ store.getEntity(appAttemptId.toString(),
+ AppAttemptMetricsConstants.ENTITY_TYPE,
+ EnumSet.allOf(Field.class));
+ // ensure two events are both published before leaving the loop
+ } while (entity == null || entity.getEvents().size() < 2);
+ }
+
+ @Test(timeout = 10000)
public void testPublishAppAttemptMetrics() throws Exception {
ApplicationAttemptId appAttemptId =
ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1);
- RMAppAttempt appAttempt = createRMAppAttempt(appAttemptId);
+ RMAppAttempt appAttempt = createRMAppAttempt(appAttemptId, false);
metricsPublisher.appAttemptRegistered(appAttempt, Integer.MAX_VALUE + 1L);
RMApp app = mock(RMApp.class);
when(app.getFinalApplicationStatus()).thenReturn(FinalApplicationStatus.UNDEFINED);
@@ -435,15 +455,17 @@ public class TestSystemMetricsPublisher {
}
private static RMAppAttempt createRMAppAttempt(
- ApplicationAttemptId appAttemptId) {
+ ApplicationAttemptId appAttemptId, boolean unmanagedAMAttempt) {
RMAppAttempt appAttempt = mock(RMAppAttempt.class);
when(appAttempt.getAppAttemptId()).thenReturn(appAttemptId);
when(appAttempt.getHost()).thenReturn("test host");
when(appAttempt.getRpcPort()).thenReturn(-100);
- Container container = mock(Container.class);
- when(container.getId())
- .thenReturn(ContainerId.newContainerId(appAttemptId, 1));
- when(appAttempt.getMasterContainer()).thenReturn(container);
+ if (!unmanagedAMAttempt) {
+ Container container = mock(Container.class);
+ when(container.getId())
+ .thenReturn(ContainerId.newContainerId(appAttemptId, 1));
+ when(appAttempt.getMasterContainer()).thenReturn(container);
+ }
when(appAttempt.getDiagnostics()).thenReturn("test diagnostics info");
when(appAttempt.getTrackingUrl()).thenReturn("test tracking url");
when(appAttempt.getOriginalTrackingUrl()).thenReturn(
