This is an automated email from the ASF dual-hosted git repository.
thenatog pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1342ea7025 NIFI-10079 Upgraded ZooKeeper from 3.5.9 to 3.8.0
1342ea7025 is described below
commit 1342ea70250840f1543d11a8e0d62c58590f049d
Author: exceptionfactory <[email protected]>
AuthorDate: Thu Jun 2 16:43:01 2022 -0500
NIFI-10079 Upgraded ZooKeeper from 3.5.9 to 3.8.0
Signed-off-by: Nathan Gough <[email protected]>
This closes #6096.
---
nifi-external/nifi-spark-receiver/pom.xml | 3 ---
.../nifi-framework/nifi-framework-core/pom.xml | 10 ++++++++++
.../nifi/controller/state/server/ZooKeeperStateServer.java | 6 ++++--
.../nifi/leader/election/ITSecureClientZooKeeperFactory.java | 2 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 7 ++++++-
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 1 -
nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 4 ----
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 4 ----
.../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 1 -
.../nifi-hbase_2-client-service-bundle/pom.xml | 1 -
.../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 4 ----
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 1 -
pom.xml | 1 +
13 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/nifi-external/nifi-spark-receiver/pom.xml
b/nifi-external/nifi-spark-receiver/pom.xml
index ddf3cf008c..531fa13582 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -22,9 +22,6 @@
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-spark-receiver</artifactId>
- <properties>
- <zookeeper.version>3.5.9</zookeeper.version>
- </properties>
<dependencyManagement>
<dependencies>
<!-- Override commons-compress -->
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index d06bfeb8f6..a3aaa8cf27 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -175,6 +175,16 @@
<artifactId>nifi-flowfile-repo-serialization</artifactId>
<version>1.17.0-SNAPSHOT</version>
</dependency>
+ <!-- metrics-core required for ZooKeeper Server -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <!-- snappy-java required for ZooKeeper Server -->
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
index 4caf58d213..f19e12ef5d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
@@ -118,7 +118,8 @@ public class ZooKeeperStateServer extends
ZooKeeperServerMain {
embeddedZkServer.setMaxSessionTimeout(config.getMaxSessionTimeout());
connectionFactory = ServerCnxnFactory.createFactory();
- connectionFactory.configure(getAvailableSocketAddress(config),
config.getMaxClientCnxns(), quorumPeerConfig.isSslQuorum());
+ final int listenBacklog =
quorumPeerConfig.getClientPortListenBacklog();
+ connectionFactory.configure(getAvailableSocketAddress(config),
config.getMaxClientCnxns(), listenBacklog, quorumPeerConfig.isSslQuorum());
connectionFactory.startup(embeddedZkServer);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -136,7 +137,8 @@ public class ZooKeeperStateServer extends
ZooKeeperServerMain {
try {
transactionLog = new
FileTxnSnapLog(quorumPeerConfig.getDataLogDir(), quorumPeerConfig.getDataDir());
connectionFactory = ServerCnxnFactory.createFactory();
-
connectionFactory.configure(getAvailableSocketAddress(quorumPeerConfig),
quorumPeerConfig.getMaxClientCnxns(), quorumPeerConfig.isSslQuorum());
+ final int listenBacklog =
quorumPeerConfig.getClientPortListenBacklog();
+
connectionFactory.configure(getAvailableSocketAddress(quorumPeerConfig),
quorumPeerConfig.getMaxClientCnxns(), listenBacklog,
quorumPeerConfig.isSslQuorum());
quorumPeer = new QuorumPeer();
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/leader/election/ITSecureClientZooKeeperFactory.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/leader/election/ITSecureClientZooKeeperFactory.java
index b0a4f22c24..dc9f9fc810 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/leader/election/ITSecureClientZooKeeperFactory.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/leader/election/ITSecureClientZooKeeperFactory.java
@@ -194,7 +194,7 @@ public class ITSecureClientZooKeeperFactory {
ZooKeeperServer zkServer = new ZooKeeperServer(dataDir.toFile(),
dataDir.toFile(), 2000);
ServerCnxnFactory secureConnectionFactory =
ServerCnxnFactory.createFactory(clientPort, -1);
- secureConnectionFactory.configure(new InetSocketAddress(clientPort),
-1, true);
+ secureConnectionFactory.configure(new InetSocketAddress(clientPort),
-1, -1, true);
secureConnectionFactory.startup(zkServer);
return secureConnectionFactory;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 9a2417e5d8..9f827c8369 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -24,7 +24,6 @@
<description>NiFi: Framework Bundle</description>
<properties>
<curator.version>5.2.1</curator.version>
- <zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>
<module>nifi-framework</module>
@@ -535,6 +534,12 @@
<artifactId>cglib-nodep</artifactId>
<version>3.3.0</version>
</dependency>
+ <!-- metrics-core marked as provided in zookeeper -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>4.1.12.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index e8d306b884..60094dd704 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -109,7 +109,6 @@
<hive.version>${hive3.version}</hive.version>
<calcite.version>1.27.0</calcite.version>
<calcite.avatica.version>1.6.0</calcite.avatica.version>
- <zookeeper.version>3.5.9</zookeeper.version>
</properties>
<build>
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
index 34608f7c80..882a64f9e6 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
@@ -25,10 +25,6 @@
<artifactId>nifi-ranger-bundle</artifactId>
<packaging>pom</packaging>
- <properties>
- <zookeeper.version>3.5.9</zookeeper.version>
- </properties>
-
<modules>
<module>nifi-ranger-plugin</module>
<module>nifi-ranger-nar</module>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
index 96a1468fc6..b6c8f5c54c 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
@@ -23,10 +23,6 @@
<artifactId>nifi-spark-bundle</artifactId>
<packaging>pom</packaging>
- <properties>
- <zookeeper.version>3.5.9</zookeeper.version>
- </properties>
-
<modules>
<module>nifi-livy-nar</module>
<module>nifi-livy-controller-service-api-nar</module>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
index 42e5a3b39c..8d01ab2ef5 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
@@ -24,7 +24,6 @@
<packaging>pom</packaging>
<properties>
<hadoop.version>2.7.3</hadoop.version>
- <zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>
<module>nifi-hbase_1_1_2-client-service</module>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
index b63e44bf2d..222a6ad0b4 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
@@ -26,7 +26,6 @@
<properties>
<hbase.version>2.2.2</hbase.version>
- <zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>
diff --git
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
index 75f8819ddf..2a3a7b04db 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
@@ -24,10 +24,6 @@
<artifactId>nifi-registry-ranger</artifactId>
<packaging>pom</packaging>
- <properties>
- <zookeeper.version>3.5.9</zookeeper.version>
- </properties>
-
<modules>
<module>nifi-registry-ranger-assembly</module>
<module>nifi-registry-ranger-jersey-bundle</module>
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index 9c8664b562..05691b571f 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -25,7 +25,6 @@
</parent>
<properties>
<curator.version>5.2.1</curator.version>
- <zookeeper.version>3.5.9</zookeeper.version>
</properties>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index b2f8265866..bdc129c58c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
<spring.version>5.3.20</spring.version>
<spring.security.version>5.7.1</spring.security.version>
<h2.version>2.1.210</h2.version>
+ <zookeeper.version>3.8.0</zookeeper.version>
</properties>
<repositories>
