You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ag...@apache.org on 2022/02/07 22:33:05 UTC
[storm] branch master updated: STORM-3817 - Upgrade Zookeeper to 3.5.9 (#3431)
This is an automated email from the ASF dual-hosted git repository.
agresch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new a0cbf5a STORM-3817 - Upgrade Zookeeper to 3.5.9 (#3431)
a0cbf5a is described below
commit a0cbf5a3d7f043ffe529b7dae1a2759de7ba49d5
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Mon Feb 7 23:32:53 2022 +0100
STORM-3817 - Upgrade Zookeeper to 3.5.9 (#3431)
---
DEPENDENCY-LICENSES | 11 +++++---
LICENSE-binary | 22 +++++++++++----
pom.xml | 32 ++++++----------------
.../storm/utils/ZookeeperServerCnxnFactory.java | 9 +-----
storm-shaded-deps/pom.xml | 13 +++++++--
5 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index 8f26aa0..3c7263a 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -134,6 +134,8 @@ List of third-party dependencies grouped by their license type.
* Apache Velocity (org.apache.velocity:velocity:1.5 - http://velocity.apache.org/engine/releases/velocity-1.5/)
* Apache XBean :: Spring (org.apache.xbean:xbean-spring:4.8 - http://geronimo.apache.org/maven/xbean/4.8/xbean-spring)
* Apache Yetus - Audience Annotations (org.apache.yetus:audience-annotations:0.5.0 - https://yetus.apache.org/audience-annotations)
+ * Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.5.9 - http://zookeeper.apache.org/zookeeper-jute)
+ * Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.5.9 - http://zookeeper.apache.org/zookeeper)
* ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
* Auto Common Libraries (com.google.auto:auto-common:0.8 - https://github.com/google/auto/auto-common)
* AutoService (com.google.auto.service:auto-service:1.0-rc4 - https://github.com/google/auto/auto-service)
@@ -230,9 +232,9 @@ List of third-party dependencies grouped by their license type.
* Commons Net (commons-net:commons-net:3.1 - http://commons.apache.org/net/)
* Commons Pool (commons-pool:commons-pool:1.5.4 - http://commons.apache.org/pool/)
* Compress-LZF (com.ning:compress-lzf:1.0.2 - http://github.com/ning/compress)
- * Curator Client (org.apache.curator:curator-client:4.2.0 - http://curator.apache.org/curator-client)
- * Curator Framework (org.apache.curator:curator-framework:4.2.0 - http://curator.apache.org/curator-framework)
- * Curator Recipes (org.apache.curator:curator-recipes:4.2.0 - http://curator.apache.org/curator-recipes)
+ * Curator Client (org.apache.curator:curator-client:4.3.0 - http://curator.apache.org/curator-client)
+ * Curator Framework (org.apache.curator:curator-framework:4.3.0 - http://curator.apache.org/curator-framework)
+ * Curator Recipes (org.apache.curator:curator-recipes:4.3.0 - http://curator.apache.org/curator-recipes)
* Data Mapper for Jackson (org.codehaus.jackson:jackson-mapper-asl:1.9.13 - http://jackson.codehaus.org)
* DataNucleus Core (org.datanucleus:datanucleus-core:4.1.17 - http://www.datanucleus.org/#/datanucleus-core)
* DataNucleus JDO API plugin (org.datanucleus:datanucleus-api-jdo:4.2.4 - http://www.datanucleus.org/#/datanucleus-api-jdo)
@@ -424,6 +426,8 @@ List of third-party dependencies grouped by their license type.
* Netty/Common (io.netty:netty-common:4.1.30.Final - http://netty.io/netty-common/)
* Netty/Handler (io.netty:netty-handler:4.1.30.Final - http://netty.io/netty-handler/)
* Netty/Resolver (io.netty:netty-resolver:4.1.30.Final - http://netty.io/netty-resolver/)
+ * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.30.Final - http://netty.io/netty-transport-native-epoll/)
+ * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.30.Final - http://netty.io/netty-transport-native-unix-common/)
* Netty/Transport (io.netty:netty-transport:4.1.30.Final - http://netty.io/netty-transport/)
* Netty (io.netty:netty:3.10.6.Final - http://netty.io/)
* Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:4.41.1 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
@@ -479,7 +483,6 @@ List of third-party dependencies grouped by their license type.
* Woodstox (org.codehaus.woodstox:woodstox-core-asl:4.4.1 - http://woodstox.codehaus.org)
* Xerces2 Java Parser (xerces:xercesImpl:2.9.1 - http://xerces.apache.org/xerces2-j)
* XML Commons External Components XML APIs (xml-apis:xml-apis:1.3.04 - http://xml.apache.org/commons/components/external/)
- * zookeeper (org.apache.zookeeper:zookeeper:3.4.14 - no url defined)
* zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url defined)
Apache License, Version 2.0, BSD 2-Clause, Eclipse Distribution License, Version 1.0, Eclipse Public License, Version 2.0, jQuery license, MIT License, Modified BSD, Public Domain, The GNU General Public License (GPL), Version 2, With Classpath Exception, W3C license
diff --git a/LICENSE-binary b/LICENSE-binary
index a917f49..08c95de 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -653,7 +653,6 @@ The license texts of these dependencies can be found in the licenses directory.
* Maven Artifact Resolver Transport HTTP (org.apache.maven.resolver:maven-resolver-transport-http:1.3.3 - https://maven.apache.org/resolver/maven-resolver-transport-http/)
* Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-repository-metadata/)
* Maven Artifact Resolver Provider (org.apache.maven:maven-resolver-provider:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-resolver-provider/)
- * zookeeper (org.apache.zookeeper:zookeeper:3.4.14 - no url defined)
* Maven Model (org.apache.maven:maven-model:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-model/)
* Netty/All-in-One (io.netty:netty-all:4.1.30.Final - http://netty.io/netty-all/)
* Maven Artifact Resolver API (org.apache.maven.resolver:maven-resolver-api:1.3.3 - https://maven.apache.org/resolver/maven-resolver-api/)
@@ -663,8 +662,16 @@ The license texts of these dependencies can be found in the licenses directory.
* Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.7.1 - http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/)
* Maven Artifact Resolver Utilities (org.apache.maven.resolver:maven-resolver-util:1.3.3 - https://maven.apache.org/resolver/maven-resolver-util/)
* Maven Artifact Resolver Connector Basic (org.apache.maven.resolver:maven-resolver-connector-basic:1.3.3 - https://maven.apache.org/resolver/maven-resolver-connector-basic/)
- * Netty (io.netty:netty:3.10.6.Final - http://netty.io/)
- * Curator Recipes (org.apache.curator:curator-recipes:4.2.0 - http://curator.apache.org/curator-recipes)
+ * Netty/All-in-One (io.netty:netty-all:4.1.30.Final - http://netty.io/netty-all/)
+ * Netty/Buffer (io.netty:netty-buffer:4.1.30.Final - http://netty.io/netty-buffer/)
+ * Netty/Codec (io.netty:netty-codec:4.1.30.Final - http://netty.io/netty-codec/)
+ * Netty/Common (io.netty:netty-common:4.1.30.Final - http://netty.io/netty-common/)
+ * Netty/Handler (io.netty:netty-handler:4.1.30.Final - http://netty.io/netty-handler/)
+ * Netty/Resolver (io.netty:netty-resolver:4.1.30.Final - http://netty.io/netty-resolver/)
+ * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.30.Final - http://netty.io/netty-transport-native-epoll/)
+ * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.30.Final - http://netty.io/netty-transport-native-unix-common/)
+ * Netty/Transport (io.netty:netty-transport:4.1.30.Final - http://netty.io/netty-transport/)
+ * Netty (io.netty:netty:3.6.2.Final - http://netty.io/)
* Aggregate Designer Algorithm (net.hydromatic:aggdesigner-algorithm:6.0 - http://github.com/julianhyde/aggdesigner/aggdesigner-algorithm)
* aircompressor (io.airlift:aircompressor:0.3 - http://github.com/airlift/aircompressor)
* Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1 - http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec)
@@ -757,6 +764,8 @@ The license texts of these dependencies can be found in the licenses directory.
* Apache Twill ZooKeeper client library (org.apache.twill:twill-zookeeper:0.6.0-incubating - http://twill.incubator.apache.org/twill-zookeeper)
* Apache Velocity (org.apache.velocity:velocity:1.5 - http://velocity.apache.org/engine/releases/velocity-1.5/)
* Apache Yetus - Audience Annotations (org.apache.yetus:audience-annotations:0.5.0 - https://yetus.apache.org/audience-annotations)
+ * Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.5.9 - http://zookeeper.apache.org/zookeeper-jute)
+ * Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.5.9 - http://zookeeper.apache.org/zookeeper)
* ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
* BoneCP :: Core Library (com.jolbox:bonecp:0.8.0.RELEASE - http://jolbox.com/bonecp)
* Calcite Core (org.apache.calcite:calcite-core:1.14.0 - https://calcite.apache.org/calcite-core)
@@ -774,8 +783,9 @@ The license texts of these dependencies can be found in the licenses directory.
* Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/)
* Commons Net (commons-net:commons-net:3.1 - http://commons.apache.org/net/)
* Commons Pool (commons-pool:commons-pool:1.5.4 - http://commons.apache.org/pool/)
- * Curator Client (org.apache.curator:curator-client:4.2.0 - http://curator.apache.org/curator-client)
- * Curator Framework (org.apache.curator:curator-framework:4.2.0 - http://curator.apache.org/curator-framework)
+ * Curator Client (org.apache.curator:curator-client:4.3.0 - http://curator.apache.org/curator-client)
+ * Curator Framework (org.apache.curator:curator-framework:4.3.0 - http://curator.apache.org/curator-framework)
+ * Curator Recipes (org.apache.curator:curator-recipes:4.3.0 - http://curator.apache.org/curator-recipes)
* Data Mapper for Jackson (org.codehaus.jackson:jackson-mapper-asl:1.9.13 - http://jackson.codehaus.org)
* DataNucleus Core (org.datanucleus:datanucleus-core:4.1.17 - http://www.datanucleus.org/#/datanucleus-core)
* DataNucleus JDO API plugin (org.datanucleus:datanucleus-api-jdo:4.2.4 - http://www.datanucleus.org/#/datanucleus-api-jdo)
@@ -899,7 +909,6 @@ The license texts of these dependencies can be found in the licenses directory.
* Tephra API (co.cask.tephra:tephra-api:0.6.0 - https://github.com/caskdata/tephra/tephra-api)
* Tephra Core (co.cask.tephra:tephra-core:0.6.0 - https://github.com/caskdata/tephra/tephra-core)
* Tephra HBase 1.0 Compatibility (co.cask.tephra:tephra-hbase-compat-1.0:0.6.0 - https://github.com/caskdata/tephra/tephra-hbase-compat-1.0)
- * zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url defined)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:1.7.26 - http://www.slf4j.org)
* Jetty :: Aggregate :: All core Jetty (org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127 - http://www.eclipse.org/jetty/jetty-aggregate-project/jetty-all)
* Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.14.v20181114 - http://www.eclipse.org/jetty)
@@ -935,6 +944,7 @@ The license texts of these dependencies can be found in the licenses directory.
* jersey-core-server (org.glassfish.jersey.core:jersey-server:2.29 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-server)
* jersey-core-common (org.glassfish.jersey.core:jersey-common:2.29 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
* Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.0.17.Final - http://hibernate.org/validator/hibernate-validator)
+ * zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url defined)
BSD 3-Clause License
diff --git a/pom.xml b/pom.xml
index d3b8b2d..84fa1a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,8 +296,7 @@
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<commons-codec.version>1.11</commons-codec.version>
<commons-cli.version>1.4</commons-cli.version>
- <curator.version>4.2.0</curator.version>
- <curator-test.version>2.13.0</curator-test.version>
+ <curator.version>4.3.0</curator.version>
<json-simple.version>1.1</json-simple.version>
<jetty.version>9.4.14.v20181114</jetty.version>
<clojure.tools.logging.version>0.2.3</clojure.tools.logging.version>
@@ -314,7 +313,7 @@
<slf4j.version>1.7.26</slf4j.version>
<metrics.version>3.2.6</metrics.version>
<mockito.version>3.0.0</mockito.version>
- <zookeeper.version>3.4.14</zookeeper.version>
+ <zookeeper.version>3.5.9</zookeeper.version>
<jline.version>0.9.94</jline.version>
<hive.version>2.3.4</hive.version>
<hadoop.version>2.8.5</hadoop.version>
@@ -834,13 +833,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
@@ -876,12 +876,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -892,21 +886,11 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
- <exclusions>
- <!-- Curator depends on Zookeeper 3.5.x, since it is still in beta we should exclude it and depend on Zookeeper 3.4.x.-->
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <!-- curator-test is not compatible with Zookeeper 3.4.x.
- Curator works around this by using an older curator-test jar.
- See https://github.com/apache/curator/tree/6ba4de36d4e8b2b65d45c005a6a92dd85c3c497f/curator-test-zk34-->
- <version>${curator-test.version}</version>
+ <version>${curator.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
index f25bc3d..07a6eb3 100644
--- a/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
+++ b/storm-server/src/main/java/org/apache/storm/utils/ZookeeperServerCnxnFactory.java
@@ -35,14 +35,7 @@ public class ZookeeperServerCnxnFactory {
max = port;
}
- try {
- factory = new NIOServerCnxnFactory();
- } catch (IOException e) {
- this.port = 0;
- factory = null;
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
+ factory = new NIOServerCnxnFactory();
//look for available port
for (; this.port <= max; this.port++) {
diff --git a/storm-shaded-deps/pom.xml b/storm-shaded-deps/pom.xml
index 4b333c3..07131ae 100644
--- a/storm-shaded-deps/pom.xml
+++ b/storm-shaded-deps/pom.xml
@@ -76,9 +76,17 @@
<groupId>org.apache.yetus</groupId>
<artifactId>audience-annotations</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <optional>true</optional>
+ <exclusions>
<exclusion>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
+ <!-- Annotations are not needed for runtime operation.-->
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -194,6 +202,7 @@
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.thrift:*</include>
<include>org.apache.zookeeper:zookeeper</include>
+ <include>org.apache.zookeeper:zookeeper-jute</include>
<include>org.jctools:jctools-core</include>
<include>org.jgrapht:jgrapht-core</include>
<include>org.yaml:snakeyaml</include>