From commits-return-64959-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Wed Jan 10 01:30:55 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 80551180718 for ; Wed, 10 Jan 2018 01:30:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6FE00160C3F; Wed, 10 Jan 2018 00:30:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B2AF8160C17 for ; Wed, 10 Jan 2018 01:30:54 +0100 (CET) Received: (qmail 23038 invoked by uid 500); 10 Jan 2018 00:30:53 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 23029 invoked by uid 99); 10 Jan 2018 00:30:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2018 00:30:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D989DFCFA; Wed, 10 Jan 2018 00:30:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-19744 Fix flakey TestZKLeaderManager Date: Wed, 10 Jan 2018 00:30:53 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-2 1454c44bc -> 660c19d4a HBASE-19744 Fix flakey TestZKLeaderManager Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/660c19d4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/660c19d4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/660c19d4 Branch: refs/heads/branch-2 Commit: 660c19d4a202561e7c49af258aab4519e75f02bd Parents: 1454c44 Author: Michael Stack Authored: Tue Jan 9 16:30:38 2018 -0800 Committer: Michael Stack Committed: Tue Jan 9 16:30:38 2018 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/zookeeper/TestZKLeaderManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/660c19d4/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java index 95ffbb4..5971a18 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.log.HBaseMarkers; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.ZKTests; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.Threads; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -65,7 +66,7 @@ public class TestZKLeaderManager { } private static class MockLeader extends Thread implements Stoppable { - private boolean stopped; + private volatile boolean stopped; private ZKWatcher watcher; private ZKLeaderManager zkLeader; private AtomicBoolean master = new AtomicBoolean(false); @@ -116,6 +117,7 @@ public class TestZKLeaderManager { public void stop(String why) { stopped = true; abdicate(); + Threads.sleep(100); watcher.close(); } @@ -136,8 +138,9 @@ public class TestZKLeaderManager { // use an abortable to fail the test in the case of any KeeperExceptions MockAbortable abortable = new MockAbortable(); - CANDIDATES = new MockLeader[3]; - for (int i = 0; i < 3; i++) { + int count = 5; + CANDIDATES = new MockLeader[count]; + for (int i = 0; i < count; i++) { ZKWatcher watcher = newZK(conf, "server"+i, abortable); CANDIDATES[i] = new MockLeader(watcher, i); CANDIDATES[i].start(); @@ -166,7 +169,6 @@ public class TestZKLeaderManager { // force a leader transition currentLeader.abdicate(); - assertFalse(currentLeader.isMaster()); // check for new leader currentLeader = getCurrentLeader(); @@ -184,7 +186,6 @@ public class TestZKLeaderManager { // force another transition by stopping the current currentLeader.stop("Stopping for test"); - assertFalse(currentLeader.isMaster()); // check for new leader currentLeader = getCurrentLeader(); @@ -202,7 +203,6 @@ public class TestZKLeaderManager { // with a second stop we can guarantee that a previous leader has resumed leading currentLeader.stop("Stopping for test"); - assertFalse(currentLeader.isMaster()); // check for new currentLeader = getCurrentLeader(); @@ -226,7 +226,7 @@ public class TestZKLeaderManager { if (currentLeader != null) { break outer; } - Thread.sleep(10); + Threads.sleep(100); } return currentLeader; }