Skip to content

Commit 3f63c94

Browse files
committed
HBASE-22716:upgrade zookeeper version to 3.5.5
1 parent 00075ea commit 3f63c94

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.apache.yetus.audience.InterfaceStability;
4343
import org.apache.zookeeper.server.ServerConfig;
4444
import org.apache.zookeeper.server.ZooKeeperServerMain;
45+
import org.apache.zookeeper.server.admin.AdminServer.AdminServerException;
4546
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
4647
import org.apache.zookeeper.server.quorum.QuorumPeerMain;
4748
import org.slf4j.Logger;
@@ -87,7 +88,7 @@ public static void main(String[] args) {
8788
}
8889

8990
private static void runZKServer(QuorumPeerConfig zkConfig)
90-
throws UnknownHostException, IOException {
91+
throws IOException, AdminServerException {
9192
if (zkConfig.isDistributed()) {
9293
QuorumPeerMain qp = new QuorumPeerMain();
9394
qp.runFromConfig(zkConfig);

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.yetus.audience.InterfaceAudience;
2727
import org.apache.zookeeper.KeeperException;
2828
import org.apache.zookeeper.ZooKeeperMain;
29+
import org.apache.zookeeper.cli.CliException;
2930

3031

3132
/**
@@ -61,7 +62,7 @@ public HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(String[] args)
6162
* @throws IOException in case of a network failure
6263
* @throws InterruptedException if the ZooKeeper client closes
6364
*/
64-
void runCmdLine() throws KeeperException, IOException, InterruptedException {
65+
void runCmdLine() throws CliException, IOException, InterruptedException {
6566
processCmd(this.cl);
6667
System.exit(0);
6768
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@
14711471
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
14721472
<thrift.path>thrift</thrift.path>
14731473
<thrift.version>0.12.0</thrift.version>
1474-
<zookeeper.version>3.4.10</zookeeper.version>
1474+
<zookeeper.version>3.5.5</zookeeper.version>
14751475
<!-- What ZooKeeper 3.4.x depends on and nothing more -->
14761476
<jline.version>0.9.94</jline.version>
14771477
<slf4j.version>1.7.25</slf4j.version>

0 commit comments

Comments
 (0)