Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19744 Fix flakey TestZKLeaderManager

This commit is contained in:
Michael Stack 2018-01-09 16:30:38 -08:00
parent 669b08f8ec
commit adf70ac329
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java
View File

@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.log.HBaseMarkers;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.ZKTests; import org.apache.hadoop.hbase.testclassification.ZKTests;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -65,7 +66,7 @@ public class TestZKLeaderManager {
} }
private static class MockLeader extends Thread implements Stoppable { private static class MockLeader extends Thread implements Stoppable {
private boolean stopped; private volatile boolean stopped;
private ZKWatcher watcher; private ZKWatcher watcher;
private ZKLeaderManager zkLeader; private ZKLeaderManager zkLeader;
private AtomicBoolean master = new AtomicBoolean(false); private AtomicBoolean master = new AtomicBoolean(false);
@ -116,6 +117,7 @@ public class TestZKLeaderManager {
public void stop(String why) { public void stop(String why) {
stopped = true; stopped = true;
abdicate(); abdicate();
Threads.sleep(100);
watcher.close(); watcher.close();
} }
@ -136,8 +138,9 @@ public class TestZKLeaderManager {
// use an abortable to fail the test in the case of any KeeperExceptions // use an abortable to fail the test in the case of any KeeperExceptions
MockAbortable abortable = new MockAbortable(); MockAbortable abortable = new MockAbortable();
CANDIDATES = new MockLeader[3]; int count = 5;
for (int i = 0; i < 3; i++) { CANDIDATES = new MockLeader[count];
for (int i = 0; i < count; i++) {
ZKWatcher watcher = newZK(conf, "server"+i, abortable); ZKWatcher watcher = newZK(conf, "server"+i, abortable);
CANDIDATES[i] = new MockLeader(watcher, i); CANDIDATES[i] = new MockLeader(watcher, i);
CANDIDATES[i].start(); CANDIDATES[i].start();
@ -166,7 +169,6 @@ public class TestZKLeaderManager {
// force a leader transition // force a leader transition
currentLeader.abdicate(); currentLeader.abdicate();
assertFalse(currentLeader.isMaster());
// check for new leader // check for new leader
currentLeader = getCurrentLeader(); currentLeader = getCurrentLeader();
@ -184,7 +186,6 @@ public class TestZKLeaderManager {
// force another transition by stopping the current // force another transition by stopping the current
currentLeader.stop("Stopping for test"); currentLeader.stop("Stopping for test");
assertFalse(currentLeader.isMaster());
// check for new leader // check for new leader
currentLeader = getCurrentLeader(); currentLeader = getCurrentLeader();
@ -202,7 +203,6 @@ public class TestZKLeaderManager {
// with a second stop we can guarantee that a previous leader has resumed leading // with a second stop we can guarantee that a previous leader has resumed leading
currentLeader.stop("Stopping for test"); currentLeader.stop("Stopping for test");
assertFalse(currentLeader.isMaster());
// check for new // check for new
currentLeader = getCurrentLeader(); currentLeader = getCurrentLeader();
@ -226,7 +226,7 @@ public class TestZKLeaderManager {
if (currentLeader != null) { if (currentLeader != null) {
break outer; break outer;
} }
Thread.sleep(10); Threads.sleep(100);
} }
return currentLeader; return currentLeader;
} }