From 03fcd96e0df5af6eadf112386e4a640648e29aa4 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 16 Apr 2025 15:33:25 +0300 Subject: [PATCH 1/2] Use 127.0.0.1 as advertised address in tests --- .../java/org/apache/bookkeeper/conf/TestBKConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestBKConfiguration.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestBKConfiguration.java index 4b1d64fc94b..842a8422278 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestBKConfiguration.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/conf/TestBKConfiguration.java @@ -52,6 +52,8 @@ public static ServerConfiguration newServerConfiguration() { // enable journal format version confReturn.setJournalFormatVersionToWrite(5); confReturn.setAllowEphemeralPorts(false); + // use 127.0.0.1 to connect to avoid DNS resolution issues in tests + confReturn.setAdvertisedAddress("127.0.0.1"); confReturn.setBookiePort(PortManager.nextFreePort()); confReturn.setGcWaitTime(1000); confReturn.setDiskUsageThreshold(0.999f); From 5a01efa38ca65b3cdd41acbf153531eb0af4e61f Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 16 Apr 2025 17:07:30 +0300 Subject: [PATCH 2/2] Reset advertised address to null in the tests that depend on it --- .../apache/bookkeeper/bookie/BookieInitializationTest.java | 3 +++ .../java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java | 3 +++ .../test/java/org/apache/bookkeeper/bookie/CookieTest.java | 3 +++ .../org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java | 3 +++ .../test/java/org/apache/bookkeeper/client/LedgerCmdTest.java | 4 +++- .../org/apache/bookkeeper/client/UpdateLedgerCmdTest.java | 3 +++ .../apache/bookkeeper/replication/BookieAutoRecoveryTest.java | 4 ++++ .../java/org/apache/bookkeeper/sasl/GSSAPIBookKeeperTest.java | 3 +++ 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java index 1b7aa371a82..988d46fa5e3 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java @@ -132,6 +132,9 @@ public class BookieInitializationTest extends BookKeeperClusterTestCase { public BookieInitializationTest() { super(0); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } @Override diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java index 3caf076082e..47140215ee7 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieIndexDirTest.java @@ -66,6 +66,9 @@ public class CookieIndexDirTest extends BookKeeperClusterTestCase { public CookieIndexDirTest() { super(0); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } private String newDirectory() throws Exception { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java index 9d068ad291a..852b4e0c311 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java @@ -69,6 +69,9 @@ public class CookieTest extends BookKeeperClusterTestCase { public CookieTest() { super(0); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } private String newDirectory() throws Exception { diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java index 51671140d9f..15c61191f2e 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java @@ -56,6 +56,9 @@ public class UpdateCookieCmdTest extends BookKeeperClusterTestCase { public UpdateCookieCmdTest() { super(0); useUUIDasBookieId = false; + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } @Override diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCmdTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCmdTest.java index 6900dfbc13d..491ae7fa408 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCmdTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCmdTest.java @@ -53,9 +53,11 @@ public LedgerCmdTest() { baseConf.setLedgerStorageClass(DbLedgerStorage.class.getName()); baseConf.setGcWaitTime(60000); baseConf.setFlushInterval(1); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } - /** * list of entry logger files that contains given ledgerId. */ diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java index e9c2fb69a52..027c9c5a1ca 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java @@ -55,6 +55,9 @@ public UpdateLedgerCmdTest() { super(3); useUUIDasBookieId = false; baseConf.setGcWaitTime(100000); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } /** diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieAutoRecoveryTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieAutoRecoveryTest.java index 20b5e6a0c61..e0578ed77ad 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieAutoRecoveryTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieAutoRecoveryTest.java @@ -88,6 +88,10 @@ public BookieAutoRecoveryTest() throws IOException, KeeperException, "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory"); baseConf.setOpenLedgerRereplicationGracePeriod(openLedgerRereplicationGracePeriod); baseConf.setRwRereplicateBackoffMs(500); + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); + baseClientConf.setLedgerManagerFactoryClassName( "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory"); this.digestType = DigestType.MAC; diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/sasl/GSSAPIBookKeeperTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/sasl/GSSAPIBookKeeperTest.java index 55485486f68..a9573d6e4dc 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/sasl/GSSAPIBookKeeperTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/sasl/GSSAPIBookKeeperTest.java @@ -158,6 +158,9 @@ public static void stopMiniKdc() { public GSSAPIBookKeeperTest() { super(0); // start them later when auth providers are configured + // disable advertised address since it takes precedence over setUseHostNameAsBookieID setting + // which is used in this test + baseConf.setAdvertisedAddress(null); } // we pass in ledgerId because the method may throw exceptions