Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10079 Upgraded ZooKeeper from 3.5.9 to 3.8.0 

Signed-off-by: Nathan Gough <thenatog@gmail.com>

This closes #6096.
This commit is contained in:
exceptionfactory 2022-06-02 16:43:01 -05:00 committed by Nathan Gough
parent 4b655ecb68
commit 1342ea7025
13 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-external/nifi-spark-receiver/pom.xml
View File

@ -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 -->

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
View File

@ -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();

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/leader/election/ITSecureClientZooKeeperFactory.java
View File

@ -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;

7
nifi-nar-bundles/nifi-framework-bundle/pom.xml
View File

@ -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>

1
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -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>

4
nifi-nar-bundles/nifi-ranger-bundle/pom.xml
View File

@ -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>

4
nifi-nar-bundles/nifi-spark-bundle/pom.xml
View File

@ -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>

1
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
View File

@ -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>

1
nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
View File

@ -26,7 +26,6 @@
<properties>
<hbase.version>2.2.2</hbase.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>

4
nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
View File

@ -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>

1
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
View File

@ -25,7 +25,6 @@
</parent>
<properties>
<curator.version>5.2.1</curator.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<dependencies>
<dependency>

1
pom.xml
View File

@ -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>