diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 3181fa51e370..f57779365a33 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -2096,4 +2096,19 @@ Copyright (c) 2007-2017 The JRuby project + + + jline + jline + JLine + 2.11 + + + BSD License + http://www.opensource.org/licenses/bsd-license.php + repo + + + + diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index eba262f64a08..920a6c4228f0 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -329,8 +329,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); ZooKeeper Client Version - <% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevision() %> - ZooKeeper client version and revision + <% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevisionHash() %> + ZooKeeper client version and revision hash ZooKeeper Client Compiled diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index f07b8e766126..b21a9c34944f 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -197,8 +197,8 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; ZooKeeper Client Version - <% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevision() %> - ZooKeeper client version and revision + <% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevisionHash() %> + ZooKeeper client version and revision hash ZooKeeper Client Compiled diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java index 65f3654a71c8..45e9d01972d6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java @@ -113,6 +113,9 @@ public void test() throws Exception { cluster.killRegionServer(rs2.getServerName()); UTIL.waitFor(30_000, () -> rs2.isStopped() && !rs2.isAlive()); UTIL.waitFor(30_000, () -> rs1.isStopped() && !rs1.isAlive()); + // make sure none of regionserver threads is alive. + UTIL.waitFor(30_000, () -> + UTIL.getMiniHBaseCluster().getLiveRegionServerThreads().isEmpty()); // Start up everything again LOG.info("Starting cluster"); UTIL.getMiniHBaseCluster().startMaster(); diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java index 8e70611e8643..4f2a77ce6775 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java @@ -23,7 +23,6 @@ import java.io.PrintWriter; import java.net.InetAddress; import java.net.NetworkInterface; -import java.net.UnknownHostException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Enumeration; @@ -42,6 +41,7 @@ import org.apache.yetus.audience.InterfaceStability; import org.apache.zookeeper.server.ServerConfig; import org.apache.zookeeper.server.ZooKeeperServerMain; +import org.apache.zookeeper.server.admin.AdminServer; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.apache.zookeeper.server.quorum.QuorumPeerMain; import org.slf4j.Logger; @@ -87,7 +87,7 @@ public static void main(String[] args) { } private static void runZKServer(QuorumPeerConfig zkConfig) - throws UnknownHostException, IOException { + throws IOException, AdminServer.AdminServerException { if (zkConfig.isDistributed()) { QuorumPeerMain qp = new QuorumPeerMain(); qp.runFromConfig(zkConfig); diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java index 3a8f9d30a555..2850ea39967c 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java @@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.yetus.audience.InterfaceAudience; +import org.apache.zookeeper.common.X509Exception; import org.apache.zookeeper.server.NIOServerCnxnFactory; import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.persistence.FileTxnLog; @@ -421,8 +422,8 @@ private static boolean waitForServerDown(int port, long timeout) throws IOExcept long start = System.currentTimeMillis(); while (true) { try { - send4LetterWord(HOST, port, "stat", (int)timeout); - } catch (IOException e) { + send4LetterWord(HOST, port, "stat", false, (int)timeout); + } catch (IOException | X509Exception.SSLContextException e) { return true; } @@ -444,7 +445,7 @@ private static boolean waitForServerUp(int port, long timeout) throws IOExceptio long start = System.currentTimeMillis(); while (true) { try { - String result = send4LetterWord(HOST, port, "stat", (int)timeout); + String result = send4LetterWord(HOST, port, "stat", false, (int)timeout); if (result.startsWith("Zookeeper version:") && !result.contains("READ-ONLY")) { return true; } else { @@ -453,7 +454,7 @@ private static boolean waitForServerUp(int port, long timeout) throws IOExceptio } catch (ConnectException e) { // ignore as this is expected, do not log stacktrace LOG.info("{}:{} not up: {}", HOST, port, e.toString()); - } catch (IOException e) { + } catch (IOException | X509Exception.SSLContextException e) { // ignore as this is expected LOG.info("{}:{} not up", HOST, port, e); } diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java index b2478cee67aa..d20b0eb58861 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java @@ -24,8 +24,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooKeeperMain; +import org.apache.zookeeper.cli.CliException; /** @@ -57,11 +57,11 @@ public HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(String[] args) /** * Run the command-line args passed. Calls System.exit when done. - * @throws KeeperException if an unexpected ZooKeeper exception happens * @throws IOException in case of a network failure * @throws InterruptedException if the ZooKeeper client closes + * @throws CliException if the ZooKeeper exception happens in cli command */ - void runCmdLine() throws KeeperException, IOException, InterruptedException { + void runCmdLine() throws IOException, InterruptedException, CliException { processCmd(this.cl); System.exit(0); } diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java index a39c4135c513..9774a51b88df 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java @@ -560,6 +560,10 @@ private void connectionEvent(WatchedEvent event) { LOG.debug(prefix("Received Disconnected from ZooKeeper, ignoring")); break; + case Closed: + LOG.debug(prefix("ZooKeeper client closed, ignoring")); + break; + case Expired: String msg = prefix(this.identifier + " received expired from " + "ZooKeeper, aborting"); diff --git a/pom.xml b/pom.xml index 3bee1bdb3140..475d58c7bc53 100755 --- a/pom.xml +++ b/pom.xml @@ -1530,9 +1530,8 @@ 0.6.1 thrift 0.12.0 - 3.4.14 - - 0.9.94 + 3.5.7 + 2.11 1.7.30 4.0.3 2.4.1