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

HBASE-19102 TestZooKeeperMainServer fails with KeeperException 

Reapplication after fixing compile issue.
This commit is contained in:
Michael Stack 2017-11-06 20:30:14 -08:00
parent f4b34675cf
commit a2ae58f6ee
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.java
View File

@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.zookeeper;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
@ -48,6 +49,15 @@ public class ZooKeeperMainServer {
public HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(String[] args)
throws IOException, InterruptedException {
super(args);
// Make sure we are connected before we proceed. Can take a while on some systems. If we
// run the command without being connected, we get ConnectionLoss KeeperErrorConnection...
long startTime = System.currentTimeMillis();
while (!this.zk.getState().isConnected()) {
Thread.sleep(1);
if ((System.currentTimeMillis() - startTime) > 10000) {
throw new InterruptedException("Failed connect " + this.zk);
}
}
}
/**
@ -100,6 +110,8 @@ public class ZooKeeperMainServer {
}
}
// If command-line arguments, run our hack so they are executed.
// ZOOKEEPER-1897 was committed to zookeeper-3.4.6 but elsewhere in this class we say
// 3.4.6 breaks command-processing; TODO.
if (hasCommandLineArguments(args)) {
HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain zkm =
new HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(newArgs);