diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 3f45cb4..99f1b21 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -2067,11 +2067,11 @@ public ApplicationAttemptReport createApplicationAttemptReport() { // am container. ContainerId amId = masterContainer == null ? null : masterContainer.getId(); - attemptReport = ApplicationAttemptReport.newInstance(this - .getAppAttemptId(), this.getHost(), this.getRpcPort(), this - .getTrackingUrl(), this.getOriginalTrackingUrl(), this.getDiagnostics(), - YarnApplicationAttemptState.valueOf(this.getState().toString()), - amId, this.startTime, this.finishTime); + attemptReport = ApplicationAttemptReport.newInstance( + this.getAppAttemptId(), this.getHost(), this.getRpcPort(), + this.getTrackingUrl(), this.getOriginalTrackingUrl(), + this.getDiagnostics(), createApplicationAttemptState(), amId, + this.startTime, this.finishTime); } finally { this.readLock.unlock(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java index 7f9610f..e7985fa 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java @@ -918,6 +918,19 @@ public void testAllocatedToFailed() { } @Test(timeout = 10000) + public void testCreateAppAttemptReport() { + RMAppAttemptState[] attemptStates = RMAppAttemptState.values(); + applicationAttempt.handle(new RMAppAttemptEvent( + applicationAttempt.getAppAttemptId(), RMAppAttemptEventType.KILL)); + // ALL RMAppAttemptState TO BE CHECK + RMAppAttempt attempt = spy(applicationAttempt); + for (RMAppAttemptState rmAppAttemptState : attemptStates) { + when(attempt.getState()).thenReturn(rmAppAttemptState); + attempt.createApplicationAttemptReport(); + } + } + + @Test(timeout = 10000) public void testLaunchedAtFinalSaving() { Container amContainer = allocateApplicationAttempt();