Skip to content

HBASE-22716:upgrade zookeeper version to 3.5.5 #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maoling wants to merge 2 commits into from
Closed

HBASE-22716:upgrade zookeeper version to 3.5.5 #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f63c94
HBASE-22716:upgrade zookeeper version to 3.5.5
maoling Jul 19, 2019
a4985ce
fix the checkstyle
maoling Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.AdminServerException;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.apache.zookeeper.server.quorum.QuorumPeerMain;
import org.slf4j.Logger;
Expand Down Expand Up @@ -87,7 +87,7 @@ public static void main(String[] args) {
}

private static void runZKServer(QuorumPeerConfig zkConfig)
throws UnknownHostException, IOException {
throws IOException, AdminServerException {
if (zkConfig.isDistributed()) {
QuorumPeerMain qp = new QuorumPeerMain();
qp.runFromConfig(zkConfig);
Expand Down
3 changes: 2 additions & 1 deletion hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.zookeeper.KeeperException;
Copy link
Contributor

@symat symat Aug 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also remove the import for KeeperException

import org.apache.zookeeper.ZooKeeperMain;
import org.apache.zookeeper.cli.CliException;


/**
Expand Down Expand Up @@ -61,7 +62,7 @@ public HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(String[] args)
* @throws IOException in case of a network failure
* @throws InterruptedException if the ZooKeeper client closes
*/
void runCmdLine() throws KeeperException, IOException, InterruptedException {
void runCmdLine() throws CliException, IOException, InterruptedException {
Copy link
Contributor

@symat symat Aug 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also remove the KeeperException from the Javadoc

processCmd(this.cl);
System.exit(0);
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
<thrift.version>0.12.0</thrift.version>
<zookeeper.version>3.4.10</zookeeper.version>
<zookeeper.version>3.5.5</zookeeper.version>
<!-- What ZooKeeper 3.4.x depends on and nothing more -->
Copy link
Contributor

@symat symat Aug 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment was also added by https://issues.apache.org/jira/browse/HBASE-20108
we can update it to "What ZooKeeper 3.5.5 depends on...", but I think it is a bit hard to decode this comment and I would change it to something like this: "providing JLine on the classpath for zookeeper (see HBASE-20108)"

<jline.version>0.9.94</jline.version>
Copy link
Contributor

@symat symat Aug 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also update the jline version? I think it was added because of zookeeper, see https://issues.apache.org/jira/browse/HBASE-20108

zookeeper 3.5.5 is using jline 2.11

however, if we increment the JLine version, then the assembly:single maven target will fail, as the license part in JLine pom changed a bit (they named it 'The BSD License' instead of 'BSD License'). To make it work, we need to add a new supplement to supplemental-models.xml like:


  <supplement>
    <project>
      <groupId>jline</groupId>
      <artifactId>jline</artifactId>
      <name>JLine</name>
      <version>2.11</version>
      <licenses>
        <license>
          <name>BSD License</name>
          <url>http://www.opensource.org/licenses/bsd-license.php</url>
          <distribution>repo</distribution>
        </license>
      </licenses>
    </project>
  </supplement>

<slf4j.version>1.7.25</slf4j.version>
Expand Down