This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c8b66a011a1 IGNITE-27885: Upgrade Apache Curator to 5.9.0 and
ZooKeeper to 3.9.4 (#12761)
c8b66a011a1 is described below
commit c8b66a011a17bdfe378856f536f4ea6e41527f1d
Author: Kirill Anisimov <[email protected]>
AuthorDate: Thu Feb 26 12:33:51 2026 +0700
IGNITE-27885: Upgrade Apache Curator to 5.9.0 and ZooKeeper to 3.9.4
(#12761)
Thank you for submitting the pull request to the Apache Ignite.
In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:
### The Contribution Checklist
- [ ] There is a single JIRA ticket related to the pull request.
- [ ] The web-link to the pull request is attached to the JIRA ticket.
- [ ] The JIRA ticket has the _Patch Available_ state.
- [ ] The pull request body describes changes that have been made.
The description explains _WHAT_ and _WHY_ was made instead of _HOW_.
- [ ] The pull request title is treated as the final commit message.
The following pattern must be used: `IGNITE-XXXX Change summary` where
`XXXX` - number of JIRA issue.
- [ ] A reviewer has been mentioned through the JIRA comments
(see [the Maintainers
list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers))
- [ ] The pull request has been checked by the Teamcity Bot and
the `green visa` attached to the JIRA ticket (see [TC.Bot: Check
PR](https://mtcga.gridgain.com/prs.html))
### Notes
- [How to
Contribute](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute)
- [Coding abbreviation
rules](https://cwiki.apache.org/confluence/display/IGNITE/Abbreviation+Rules)
- [Coding
Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines)
- [Apache Ignite Teamcity
Bot](https://cwiki.apache.org/confluence/display/IGNITE/Apache+Ignite+Teamcity+Bot)
If you need any help, please email [email protected] or ask anу
advice on http://asf.slack.com _#ignite_ channel.
---
...coverySegmentationAndConnectionRestoreTest.java | 10 ++++----
.../ZookeeperDiscoverySpiSaslAuthAbstractTest.java | 27 ++++++++++++++++++++++
parent/pom.xml | 4 ++--
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySegmentationAndConnectionRestoreTest.java
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySegmentationAndConnectionRestoreTest.java
index 8662153568c..348234dbd72 100644
---
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySegmentationAndConnectionRestoreTest.java
+++
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySegmentationAndConnectionRestoreTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.curator.test.InstanceSpec;
import org.apache.curator.test.TestingZooKeeperServer;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteState;
@@ -45,7 +46,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.transactions.Transaction;
import org.apache.zookeeper.ZkTestClientCnxnSocketNIO;
import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
import org.junit.Ignore;
import org.junit.Test;
@@ -254,10 +254,12 @@ public class
ZookeeperDiscoverySegmentationAndConnectionRestoreTest extends Zook
srvs.get(0).stop();
srvs.get(1).stop();
- QuorumPeer qp = srvs.get(2).getQuorumPeer();
+ InstanceSpec spec = srvs.get(2).getInstanceSpec();
+
+ // Conservative upper bound: (tickTime * 10) is a typical
initLimit default in ZK quorum configs
+ // + 15 seconds for additional logic
+ assertTrue(l.await((long)spec.getTickTime() * 10 + 15000,
TimeUnit.MILLISECONDS));
- // Zookeeper's socket timeout [tickTime * initLimit] + 5
additional seconds for other logic
- assertTrue(l.await(qp.getTickTime() * qp.getInitLimit() + 5000,
TimeUnit.MILLISECONDS));
}
finally {
zkCluster.close();
diff --git
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslAuthAbstractTest.java
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslAuthAbstractTest.java
index a4d4fc5d214..8acf5e05e6f 100644
---
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslAuthAbstractTest.java
+++
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSaslAuthAbstractTest.java
@@ -50,6 +50,12 @@ public abstract class
ZookeeperDiscoverySpiSaslAuthAbstractTest extends GridComm
/** */
private static final String SASL_CONFIG =
"java.security.auth.login.config";
+ /** */
+ private static final String ZK_FIPS_MODE = "zookeeper.fips-mode";
+
+ /** */
+ private String prevZkFipsMode;
+
/** */
private long joinTimeout = 2_000;
@@ -89,6 +95,8 @@ public abstract class
ZookeeperDiscoverySpiSaslAuthAbstractTest extends GridComm
prepareSaslSystemProperties();
+ disableZookeeperFipsMode();
+
startZooKeeperServer();
}
@@ -101,6 +109,25 @@ public abstract class
ZookeeperDiscoverySpiSaslAuthAbstractTest extends GridComm
clearSaslSystemProperties();
clearTmpDir();
+
+ restoreZookeeperFipsMode();
+ }
+
+ /** */
+ private void disableZookeeperFipsMode() {
+ prevZkFipsMode = System.getProperty(ZK_FIPS_MODE);
+
+ System.setProperty(ZK_FIPS_MODE, "false");
+ }
+
+ /** */
+ private void restoreZookeeperFipsMode() {
+ if (prevZkFipsMode == null)
+ System.clearProperty(ZK_FIPS_MODE);
+ else
+ System.setProperty(ZK_FIPS_MODE, prevZkFipsMode);
+
+ prevZkFipsMode = null;
}
/** */
diff --git a/parent/pom.xml b/parent/pom.xml
index 265b4330ee5..41ef2b3f492 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -72,7 +72,7 @@
<commons.io.version>2.21.0</commons.io.version>
<commons.dbcp.version>1.4</commons.dbcp.version>
<cron4j.version>2.2.5</cron4j.version>
- <curator.version>5.3.0</curator.version>
+ <curator.version>5.9.0</curator.version>
<guava.version>32.1.2-jre</guava.version>
<grpc-context.version>1.62.2</grpc-context.version>
<h2.version>1.4.197</h2.version>
@@ -110,7 +110,7 @@
<surefire.version>3.1.2</surefire.version>
<tomcat.version>9.0.63</tomcat.version>
<yardstick.version>0.8.3</yardstick.version>
- <zookeeper.version>3.8.4</zookeeper.version>
+ <zookeeper.version>3.9.4</zookeeper.version>
<zstd.version>1.5.5-5</zstd.version>
<opencensus.version>0.31.1</opencensus.version>
<commons.lang3.version>3.18.0</commons.lang3.version>
