Repository: hadoop Updated Branches: refs/heads/branch-2 6ce9b1240 -> 123269c07
YARN-4411. RMAppAttemptImpl#createApplicationAttemptReport throws IllegalArgumentException. Contributed by Bibin A Chundatt and yarntime. (cherry picked from commit a277bdc9edc66bef419fcd063b832073e512f234) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/123269c0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/123269c0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/123269c0 Branch: refs/heads/branch-2 Commit: 123269c07f94b1792aea2613d78c019a9e53a8aa Parents: 6ce9b12 Author: Devaraj K <[email protected]> Authored: Fri Jan 29 13:51:37 2016 +0530 Committer: Devaraj K <[email protected]> Committed: Fri Jan 29 13:52:47 2016 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../rmapp/attempt/RMAppAttemptImpl.java | 10 +++++----- .../rmapp/attempt/TestRMAppAttemptTransitions.java | 13 +++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/123269c0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 78e981c..fd9cf3a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -334,6 +334,9 @@ Release 2.8.0 - UNRELEASED YARN-4219. New levelDB cache storage for timeline v1.5. (Li Lu via xgong) + YARN-4411. RMAppAttemptImpl#createApplicationAttemptReport throws + IllegalArgumentException. (Bibin A Chundatt, yarntime via devaraj) + IMPROVEMENTS YARN-644. Basic null check is not performed on passed in arguments before http://git-wip-us.apache.org/repos/asf/hadoop/blob/123269c0/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 ---------------------------------------------------------------------- diff --git a/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 b/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 --- a/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 +++ b/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 class RMAppAttemptImpl implements RMAppAttempt, Recoverable { // 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(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/123269c0/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 ---------------------------------------------------------------------- diff --git a/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 b/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 --- a/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 +++ b/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 class TestRMAppAttemptTransitions { } @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();
