This is an automated email from the ASF dual-hosted git repository.
chenhang pushed a commit to branch branch-4.14
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.14 by this push:
new 1317bf4c69 [Branch-4.14] Fix TLS test local port case problem (#3557)
1317bf4c69 is described below
commit 1317bf4c69007a16c36fbe049fc75e542c6fb4cb
Author: Yan Zhao <[email protected]>
AuthorDate: Wed Oct 26 10:56:23 2022 +0800
[Branch-4.14] Fix TLS test local port case problem (#3557)
Descriptions of the changes in this PR:
When we config as follow:
```
conf.setDisableServerSocketBind(true);
conf.setEnableLocalTransport(true);
```
The BookieNettyServer will create jvmBootstrap, it binds the address by
bookieId.
https://github.com/apache/bookkeeper/blob/255416a8552f34e5fd50231bbeed77e0945b63e3/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java#L374-L428
At line_426, it use bookieId to bind, there is a flag about
`BookKeeperClusterTestCase#useUUIDasBookieId`, it set uuid to bookieId.
When the client connects to the server, the remoteAddress
`local:a4367111-5740-40dd-a8b2-0fcb2995398b` is strange, the resolve logic
throw java.lang.ArrayIndexOutOfBoundsException.
https://github.com/apache/bookkeeper/blob/255416a8552f34e5fd50231bbeed77e0945b63e3/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java#L1502-L1515
The master branch looks good, The pr #2723 remove logic.
```
// use a random BookieId
if (useUUIDasBookieId) {
conf.setBookieId(UUID.randomUUID().toString());
}
```
---
.../apache/bookkeeper/client/BookieNetworkAddressChangeTest.java | 7 +++----
.../java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java | 2 ++
.../java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java | 7 -------
.../src/test/java/org/apache/bookkeeper/tls/TestTLS.java | 6 ++++--
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieNetworkAddressChangeTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieNetworkAddressChangeTest.java
index 977eb8cc30..b1b47223e2 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieNetworkAddressChangeTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieNetworkAddressChangeTest.java
@@ -34,6 +34,7 @@ import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.discover.ZKRegistrationClient;
import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
import org.apache.bookkeeper.util.PortManager;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -88,6 +89,7 @@ public class BookieNetworkAddressChangeTest extends
BookKeeperClusterTestCase {
}
@Test
+ @Ignore("PLSR-1850 Seems like restart of the bookie always comes up on
same port hence failing this test")
public void testFollowBookieAddressChangeTrckingDisabled() throws
Exception {
ClientConfiguration conf = new ClientConfiguration();
conf.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
@@ -109,10 +111,7 @@ public class BookieNetworkAddressChangeTest extends
BookKeeperClusterTestCase {
// restart bookie, change port
// on metadata we have a bookieId, not the network address
- ServerConfiguration thisServerConf = new
ServerConfiguration(baseConf);
- thisServerConf.setBookiePort(PortManager.nextFreePort());
- restartBookies(thisServerConf);
-
+ restartBookie(getBookie(0));
try (ReadHandle h = bkc
.newOpenLedgerOp()
.withLedgerId(lId)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
index 996c04047f..3bdaa50d9f 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
@@ -198,6 +198,8 @@ public class TestDelayEnsembleChange extends
BookKeeperClusterTestCase {
LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION + " should be > 0 for
" + addr,
bkc.getTestStatsProvider().getCounter(
CLIENT_SCOPE + ".bookie_" +
addr.toString().replace('-', '_')
+ .replace(":", "_")
+ .replace(".", "_")
+ "." +
LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION)
.get() > 0);
}
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
index 685544a3d4..37fd1f52f8 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
@@ -37,7 +37,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
@@ -643,12 +642,6 @@ public abstract class BookKeeperClusterTestCase {
public int startNewBookie()
throws Exception {
ServerConfiguration conf = newServerConfiguration();
-
- // use a random BookieId
- if (useUUIDasBookieId) {
- conf.setBookieId(UUID.randomUUID().toString());
- }
-
bsConfs.add(conf);
LOG.info("Starting new bookie on port: {}", conf.getBookiePort());
BookieServer server = startBookie(conf);
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
index 2f398b0044..e32319e9b8 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
@@ -895,7 +895,8 @@ public class TestTLS extends BookKeeperClusterTestCase {
.append("bookie_")
.append(bookie.getBookieId().toString()
.replace('.', '_')
- .replace('-', '_'))
+ .replace('-', '_')
+ .replace(":", "_"))
.append(".");
// check stats on TLS enabled client
@@ -996,7 +997,8 @@ public class TestTLS extends BookKeeperClusterTestCase {
.append("bookie_")
.append(bookie.getBookieId().toString()
.replace('.', '_')
- .replace('-', '_'))
+ .replace('-', '_')
+ .replace(":", "_"))
.append(".");
assertEquals("TLS handshake failure expected", 1,
