hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rohithsharm...@apache.org
Subject hadoop git commit: YARN-2398. TestResourceTrackerOnHA crashes. Contributed by Ajith S.
Date Thu, 11 Aug 2016 06:10:40 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk a428d4f50 -> 666ad0b67


YARN-2398. TestResourceTrackerOnHA crashes. Contributed by Ajith S.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/666ad0b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/666ad0b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/666ad0b6

Branch: refs/heads/trunk
Commit: 666ad0b67b9162860fccddbd1d89c806c70b60ef
Parents: a428d4f
Author: Rohith Sharma K S <rohithsharmaks@apache.org>
Authored: Thu Aug 11 11:27:00 2016 +0530
Committer: Rohith Sharma K S <rohithsharmaks@apache.org>
Committed: Thu Aug 11 11:27:00 2016 +0530

----------------------------------------------------------------------
 .../java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/666ad0b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java
index f336b0f..a8e9132 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java
@@ -328,7 +328,7 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes {
     private boolean waittingForFailOver() {
       int maximumWaittingTime = 50;
       int count = 0;
-      while (!failoverTriggered.get() && count >= maximumWaittingTime) {
+      while (!failoverTriggered.get() && count <= maximumWaittingTime) {
         try {
           Thread.sleep(100);
         } catch (InterruptedException e) {
@@ -336,7 +336,7 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes {
         }
         count++;
       }
-      if (count >= maximumWaittingTime) {
+      if (count >= maximumWaittingTime && failoverThread != null) {
         return false;
       }
       try {


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message