Skip to content

GH-1251: Upgrade Zookeeper to 3.9.3+ #1252

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

Merged
kezhuw merged 6 commits into from
Jun 23, 2025
+6 −7
Merged

GH-1251: Upgrade Zookeeper to 3.9.3+ #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b35d5b2
GH-1251: Upgrade Zookeeper to 3.9.3+
Mar 11, 2025
e47ac0e
Update TestingZooKeeperMain.java
Mar 11, 2025
2b263ac
Update TestingZooKeeperMain.java
Mar 11, 2025
4280230
Adding boolean parameters
Mar 12, 2025
eb55173
Session could expired if all servers stopped since ZOOKEEPER-4508
kezhuw Jun 15, 2025
bca26a9
Use shutdown() instead of shutdown(false)
kezhuw Jun 15, 2025
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
2 changes: 1 addition & 1 deletion curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
try {
client.checkExists().forPath("/");
fail("Connection should be down");
} catch (KeeperException.ConnectionLossException e) {
} catch (KeeperException.ConnectionLossException | KeeperException.SessionExpiredException e) {
// expected
}

Expand Down
9 changes: 4 additions & 5 deletions curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
View file
Open in desktop
Copy link
Member

@tisonkun tisonkun Mar 12, 2025

Choose a reason for hiding this comment

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

Seems these changes cause compile fail. Why do you make these changes?

Copy link
Contributor Author

@aminadinari19 aminadinari19 Mar 12, 2025

Choose a reason for hiding this comment

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

@tisonkun Thank-you for taking a look at the PR. It seems like in the newer version of zookeeper, the method that was being overridden has become final, so I just altered the access method to it.

Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void close() throws IOException {

try {
if (zkServer != null) {
zkServer.shutdown();
zkServer.customShutdown();
ZKDatabase zkDb = zkServer.getZKDatabase();
if (zkDb != null) {
// make ZK server close its log files
Expand Down Expand Up @@ -209,7 +209,7 @@ private void internalRunFromConfig(ServerConfig config) throws IOException {
latch.countDown();
cnxnFactory.join();
if ((zkServer != null) && zkServer.isRunning()) {
zkServer.shutdown();
zkServer.customShutdown();
}
} catch (InterruptedException e) {
// warn, but generally this is ok
Expand Down Expand Up @@ -255,9 +255,8 @@ public TestZooKeeperServer(FileTxnSnapLog txnLog, ServerConfig config) {
this.setMaxSessionTimeout(config.getMaxSessionTimeout());
}

@Override
public synchronized void shutdown(boolean fullyShutDown) {
super.shutdown(fullyShutDown);
public synchronized void customShutdown() {
super.shutdown();
try {
txnLog.close();
} catch (IOException e) {
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 @@ -72,7 +72,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>

<!-- versions -->
<zookeeper-version>3.9.2</zookeeper-version>
<zookeeper-version>3.9.3</zookeeper-version>
<maven-bundle-plugin-version>5.1.4</maven-bundle-plugin-version>
<maven-compiler-plugin-version>3.10.0</maven-compiler-plugin-version>
<maven-dependency-plugin-version>3.2.0</maven-dependency-plugin-version>
Expand Down