From cc5bc4618739edf6ed41a341a27ca3bb383d7aff Mon Sep 17 00:00:00 2001 From: bigduu Date: Wed, 6 Aug 2025 20:24:19 +0800 Subject: [PATCH 1/2] Add debug logging for client port hijack failures in ZooKeeperServerEmbeddedAdapter Add debug log for some specify situation to help developer identify the issue location --- .../apache/curator/test/ZooKeeperServerEmbeddedAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java b/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java index 3954fc718..9e9f12e5c 100644 --- a/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java +++ b/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java @@ -98,8 +98,9 @@ private boolean hijackClientPort(int port) { addressField.set(peerConfig, new InetSocketAddress(port)); return true; } - } catch (Exception ignored) { + } catch (Exception e) { // swallow hijack failure to accommodate possible upstream changes + log.debug("Failed to hijack client port configuration, this may be due to upstream changes", e); } return false; } From 6e87a9d81abc0491cc0206745b987d16206df895 Mon Sep 17 00:00:00 2001 From: bigduu Date: Fri, 8 Aug 2025 19:39:50 +0800 Subject: [PATCH 2/2] Update curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java b/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java index 9e9f12e5c..a99253236 100644 --- a/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java +++ b/curator-test/src/main/java/org/apache/curator/test/ZooKeeperServerEmbeddedAdapter.java @@ -100,7 +100,7 @@ private boolean hijackClientPort(int port) { } } catch (Exception e) { // swallow hijack failure to accommodate possible upstream changes - log.debug("Failed to hijack client port configuration, this may be due to upstream changes", e); + log.debug("Failed to hijack client port configuration. This may be due to upstream changes", e); } return false; }