You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/02/20 04:32:37 UTC
[GitHub] sijie closed pull request #1172: Use BookieServer#getLocalAddress as the identifier in the test
sijie closed pull request #1172: Use BookieServer#getLocalAddress as the identifier in the test
URL: https://github.com/apache/bookkeeper/pull/1172
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
index 38bb59d0d..0536ff804 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
@@ -28,7 +28,6 @@
import io.netty.buffer.ByteBuf;
import java.io.IOException;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -307,20 +306,18 @@ public void testAsyncBookieRecoveryToSpecificBookie() throws Exception {
// Shutdown the first bookie server
LOG.info("Finished writing all ledger entries so shutdown one of the bookies.");
- int initialPort = bsConfs.get(0).getBookiePort();
+ BookieSocketAddress bookieSrc = bs.get(0).getLocalAddress();
bs.get(0).shutdown();
bs.remove(0);
// Startup a new bookie server
- int newBookiePort = startNewBookie();
+ startNewBookie();
// Write some more entries for the ledgers so a new ensemble will be
// created for them.
writeEntriestoLedgers(numMsgs, 10, lhs);
// Call the async recover bookie method.
- BookieSocketAddress bookieSrc = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- initialPort);
// Initiate the sync object
sync.value = false;
bkAdmin.asyncRecoverBookieData(bookieSrc, bookieRecoverCb, sync);
@@ -359,7 +356,7 @@ public void testAsyncBookieRecoveryToRandomBookies() throws Exception {
// Shutdown the first bookie server
LOG.info("Finished writing all ledger entries so shutdown one of the bookies.");
- int initialPort = bsConfs.get(0).getBookiePort();
+ BookieSocketAddress bookieSrc = bs.get(0).getLocalAddress();
bs.get(0).shutdown();
bs.remove(0);
@@ -373,8 +370,6 @@ public void testAsyncBookieRecoveryToRandomBookies() throws Exception {
writeEntriestoLedgers(numMsgs, 10, lhs);
// Call the async recover bookie method.
- BookieSocketAddress bookieSrc = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- initialPort);
LOG.info("Now recover the data on the killed bookie (" + bookieSrc
+ ") and replicate it to a random available one");
// Initiate the sync object
@@ -414,7 +409,7 @@ public void testSyncBookieRecoveryToSpecificBookie() throws Exception {
// Shutdown the first bookie server
LOG.info("Finished writing all ledger entries so shutdown one of the bookies.");
- int initialPort = bsConfs.get(0).getBookiePort();
+ BookieSocketAddress bookieSrc = bs.get(0).getLocalAddress();
bs.get(0).shutdown();
bs.remove(0);
@@ -426,12 +421,7 @@ public void testSyncBookieRecoveryToSpecificBookie() throws Exception {
writeEntriestoLedgers(numMsgs, 10, lhs);
// Call the sync recover bookie method.
- BookieSocketAddress bookieSrc = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- initialPort);
- BookieSocketAddress bookieDest = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- newBookiePort);
- LOG.info("Now recover the data on the killed bookie (" + bookieSrc + ") and replicate it to the new one ("
- + bookieDest + ")");
+ LOG.info("Now recover the data on the killed bookie (" + bookieSrc + ") and replicate it to other bookies");
bkAdmin.recoverBookieData(bookieSrc);
// Verify the recovered ledger entries are okay.
@@ -460,7 +450,7 @@ public void testSyncBookieRecoveryToRandomBookies() throws Exception {
// Shutdown the first bookie server
LOG.info("Finished writing all ledger entries so shutdown one of the bookies.");
- int initialPort = bsConfs.get(0).getBookiePort();
+ BookieSocketAddress bookieSrc = bs.get(0).getLocalAddress();
bs.get(0).shutdown();
bs.remove(0);
@@ -474,8 +464,6 @@ public void testSyncBookieRecoveryToRandomBookies() throws Exception {
writeEntriestoLedgers(numMsgs, 10, lhs);
// Call the sync recover bookie method.
- BookieSocketAddress bookieSrc = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- initialPort);
LOG.info("Now recover the data on the killed bookie (" + bookieSrc
+ ") and replicate it to a random available one");
bkAdmin.recoverBookieData(bookieSrc);
@@ -757,13 +745,11 @@ public void testAsyncBookieRecoveryToRandomBookiesNotEnoughBookies() throws Exce
// Shutdown the first bookie server
LOG.info("Finished writing all ledger entries so shutdown one of the bookies.");
- int initialPort = bsConfs.get(0).getBookiePort();
+ BookieSocketAddress bookieSrc = bs.get(0).getLocalAddress();
bs.get(0).shutdown();
bs.remove(0);
// Call the async recover bookie method.
- BookieSocketAddress bookieSrc = new BookieSocketAddress(InetAddress.getLocalHost().getHostAddress(),
- initialPort);
LOG.info("Now recover the data on the killed bookie (" + bookieSrc
+ ") and replicate it to a random available one");
// Initiate the sync object
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
index a4d60aaa9..c620cc16e 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
@@ -25,7 +25,6 @@
import com.google.common.collect.Sets;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Enumeration;
@@ -95,14 +94,13 @@ public void testReplicateLFShouldCopyFailedBookieFragmentsToTargetBookie()
LOG.info("Killing Bookie", replicaToKill);
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
+
for (int i = 0; i < 10; i++) {
lh.addEntry(data);
}
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
Set<LedgerFragment> result = getFragmentsToReplicate(lh);
BookKeeperAdmin admin = new BookKeeperAdmin(baseClientConf);
@@ -161,13 +159,12 @@ public void testReplicateLFFailsOnlyOnLastUnClosedFragments()
BookieSocketAddress replicaToKill2 = lh.getLedgerMetadata()
.getEnsembles().get(0L).get(1);
- int startNewBookie2 = startNewBookie();
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
+
LOG.info("Killing Bookie", replicaToKill2);
killBookie(replicaToKill2);
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie2);
- LOG.info("New Bookie addr :" + newBkAddr);
Set<LedgerFragment> result = getFragmentsToReplicate(lh);
BookKeeperAdmin admin = new BookKeeperAdmin(baseClientConf);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestAutoRecoveryAlongWithBookieServers.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestAutoRecoveryAlongWithBookieServers.java
index af456d3dd..3d397346b 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestAutoRecoveryAlongWithBookieServers.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestAutoRecoveryAlongWithBookieServers.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Map.Entry;
@@ -71,9 +70,7 @@ public void testAutoRecoveryAlongWithBookieServers() throws Exception {
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
while (ReplicationTestUtil.isLedgerInUnderReplication(zkc, lh.getId(),
basePath)) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
index b60d3f6f5..cc988f100 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Map.Entry;
@@ -125,15 +124,13 @@ public void testRWShouldReplicateFragmentsToTargetBookie() throws Exception {
LOG.info("Killing Bookie", replicaToKill);
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
+
for (int i = 0; i < 10; i++) {
lh.addEntry(data);
}
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
-
ReplicationWorker rw = new ReplicationWorker(zkc, baseConf);
rw.start();
@@ -175,9 +172,7 @@ public void testRWShouldRetryUntilThereAreEnoughBksAvailableForReplication()
LOG.info("Killing Bookie", replicaToKill);
ServerConfiguration killedBookieConfig = killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
LOG.info("New Bookie addr :" + newBkAddr);
killAllBookies(lh, newBkAddr);
@@ -229,17 +224,13 @@ public void test2RWsShouldCompeteForReplicationOf2FragmentsAndCompleteReplicatio
killAllBookies(lh, null);
// Starte RW1
- int startNewBookie1 = startNewBookie();
- BookieSocketAddress newBkAddr1 = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie1);
- LOG.info("New Bookie addr :" + newBkAddr1);
+ BookieSocketAddress newBkAddr1 = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr1);
ReplicationWorker rw1 = new ReplicationWorker(zkc, baseConf);
// Starte RW2
- int startNewBookie2 = startNewBookie();
- BookieSocketAddress newBkAddr2 = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie2);
- LOG.info("New Bookie addr :" + newBkAddr2);
+ BookieSocketAddress newBkAddr2 = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr2);
ZooKeeper zkc1 = ZooKeeperClient.newBuilder()
.connectString(zkUtil.getZooKeeperConnectString())
.sessionTimeoutMs(10000)
@@ -293,10 +284,8 @@ public void testRWShouldCleanTheLedgerFromUnderReplicationIfLedgerAlreadyDeleted
LOG.info("Killing Bookie", replicaToKill);
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
ReplicationWorker rw = new ReplicationWorker(zkc, baseConf);
rw.start();
@@ -349,11 +338,8 @@ public void testMultipleLedgerReplicationWithReplicationWorker()
killBookie(replicaToKillFromFirstLedger);
lh2.close();
- int startNewBookie = startNewBookie();
-
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
ReplicationWorker rw = new ReplicationWorker(zkc, baseConf);
@@ -406,11 +392,8 @@ public void testRWShouldReplicateTheLedgersAfterTimeoutIfLastFragmentIsUR()
LOG.info("Killing Bookie", replicaToKill);
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
-
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
// set to 3s instead of default 30s
baseConf.setOpenLedgerRereplicationGracePeriod("3000");
@@ -468,7 +451,8 @@ public void testRWShouldReplicateTheLedgersAfterTimeoutIfLastFragmentIsNotUR()
LOG.info("Killing Bookie", replicaToKill);
killBookie(replicaToKill);
- int startNewBookie = startNewBookie();
+ BookieSocketAddress newBkAddr = startNewBookieAndReturnAddress();
+ LOG.info("New Bookie addr : {}", newBkAddr);
// Reform ensemble...Making sure that last fragment is not in
// under-replication
@@ -476,10 +460,6 @@ public void testRWShouldReplicateTheLedgersAfterTimeoutIfLastFragmentIsNotUR()
lh.addEntry(data);
}
- BookieSocketAddress newBkAddr = new BookieSocketAddress(InetAddress
- .getLocalHost().getHostAddress(), startNewBookie);
- LOG.info("New Bookie addr :" + newBkAddr);
-
ReplicationWorker rw = new ReplicationWorker(zkc, baseConf);
baseClientConf.setZkServers(zkUtil.getZooKeeperConnectString());
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 b965d1531..04e253de5 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
@@ -584,12 +584,18 @@ public void restartBookies(ServerConfiguration newConf)
*/
public int startNewBookie()
throws Exception {
+ return startNewBookieAndReturnAddress().getPort();
+ }
+
+ public BookieSocketAddress startNewBookieAndReturnAddress()
+ throws Exception {
ServerConfiguration conf = newServerConfiguration();
bsConfs.add(conf);
LOG.info("Starting new bookie on port: {}", conf.getBookiePort());
- bs.add(startBookie(conf));
+ BookieServer server = startBookie(conf);
+ bs.add(server);
- return conf.getBookiePort();
+ return server.getLocalAddress();
}
/**
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services