Repository: hadoop Updated Branches: refs/heads/HADOOP-13345 d2cf8b54c -> ae4db2544
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/HADOOP-13345 Commit: 666ad0b67b9162860fccddbd1d89c806c70b60ef Parents: a428d4f Author: Rohith Sharma K S <[email protected]> Authored: Thu Aug 11 11:27:00 2016 +0530 Committer: Rohith Sharma K S <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
