You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2015/09/23 05:40:53 UTC
[19/50] [abbrv] hadoop git commit: YARN-4135. Improve the assertion
message in MockRM while failing after waiting for the state.(Nijel S F via
rohithsharmaks)
YARN-4135. Improve the assertion message in MockRM while failing after waiting for the state.(Nijel S F via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/723c31d4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/723c31d4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/723c31d4
Branch: refs/heads/HDFS-7285
Commit: 723c31d45bc0f64b1d1a67350b108059d2a220a3
Parents: 6b97fa6
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Fri Sep 18 08:44:10 2015 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Fri Sep 18 08:44:10 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/723c31d4/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 18318fb..90b0e82 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -848,6 +848,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/723c31d4/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);
}
}