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/7d046dd3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d046dd3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d046dd3
Branch: refs/heads/branch-2.7
Commit: 7d046dd3751a18d3ceaadc2874dbf7322af10b1e
Parents: 6cf2fa3
Author: Jason Lowe <jl...@apache.org>
Authored: Mon Jan 25 16:32:57 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Jan 25 16:32:57 2016 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 6 ++++
.../metrics/SystemMetricsPublisher.java | 18 +++++++----
.../metrics/TestSystemMetricsPublisher.java | 34 ++++++++++++++++----
3 files changed, 45 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d046dd3/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index cf47bce..1bdd633 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -51,6 +51,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-4546. ResourceManager crash due to scheduling opportunity overflow.
(Jason Lowe via junping_du)
@@ -949,6 +952,9 @@ Release 2.6.4 - UNRELEASED
BUG FIXES
+ YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R
+ via junping_du)
+
YARN-4414. Nodemanager connection errors are retried at multiple levels
(Chang Li via jlowe)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d046dd3/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 4d52b38..2d9ae98 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
@@ -142,6 +142,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(),
@@ -149,7 +151,7 @@ public class SystemMetricsPublisher extends
CompositeService {
appAttempt.getRpcPort(),
appAttempt.getTrackingUrl(),
appAttempt.getOriginalTrackingUrl(),
- appAttempt.getMasterContainer().getId(),
+ container,
registeredTime));
}
}
@@ -335,9 +337,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);
@@ -362,9 +365,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/7d046dd3/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 7ed3835..32f677b 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
@@ -194,10 +194,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);
@@ -356,15 +376,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(
