Repository: hadoop Updated Branches: refs/heads/branch-2 1f75e951f -> d94c092ad
YARN-4135. Improve the assertion message in MockRM while failing after waiting for the state.(Nijel S F via rohithsharmaks) (cherry picked from commit 723c31d45bc0f64b1d1a67350b108059d2a220a3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d94c092a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d94c092a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d94c092a Branch: refs/heads/branch-2 Commit: d94c092ad1e6007ca98979c2f83e57e52b740b44 Parents: 1f75e95 Author: Rohith Sharma K S <[email protected]> Authored: Fri Sep 18 08:44:10 2015 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Fri Sep 18 08:46:36 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/yarn/server/resourcemanager/MockRM.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d94c092a/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ec05090..e62bded 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -796,6 +796,9 @@ Release 2.8.0 - UNRELEASED YARN-4078. Add getPendingResourceRequestForAttempt in YarnScheduler interface. (Naganarasimha G R via jianhe) + YARN-4135. Improve the assertion message in MockRM while failing after waiting for the state. + (Nijel S F via rohithsharmaks) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d94c092a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.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/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index e464401..249f093 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -156,7 +156,8 @@ public class MockRM extends ResourceManager { LOG.info("App State is : " + app.getState()); if (waitedMsecs >= timeoutMsecs) { Assert.fail("App state is not correct (timedout): expected: " + - finalState + " actual: " + app.getState()); + finalState + " actual: " + app.getState() + + " for the application " + appId); } } @@ -185,7 +186,8 @@ public class MockRM extends ResourceManager { LOG.info("Attempt State is : " + attempt.getAppAttemptState()); if (waitedMsecs >= timeoutMsecs) { Assert.fail("Attempt state is not correct (timedout): expected: " - + finalState + " actual: " + attempt.getAppAttemptState()); + + finalState + " actual: " + attempt.getAppAttemptState()+ + " for the application attempt " + attemptId); } }
