BOOKKEEPER-767: Allow loopback in tests (ivank via fpj)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1600881 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 6, 2014 · 80c6e55 · 80c6e55
1 parent 68deb96
commit 80c6e55
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -61,6 +61,8 @@ Trunk (unreleased changes)
       BOOKKEEPER-763: findbugs fails to run on jenkins (ivank)
 
       BOOKKEEPER-766: Update notice.txt files to include 2014 (ivank via fpj)
+
+      BOOKKEEPER-767: Allow loopback in tests (ivank via fpj)
 
       bookkeeper-server:
 

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
@@ -98,7 +98,7 @@ public void testExitCodeZK_REG_FAIL() throws Exception {
         tmpDir.delete();
         tmpDir.mkdir();
 
-        final ServerConfiguration conf = new ServerConfiguration()
+        final ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(null).setJournalDirName(tmpDir.getPath())
                 .setLedgerDirNames(new String[] { tmpDir.getPath() });
 
@@ -370,7 +370,7 @@ public void testWithDiskFull() throws Exception {
         tempDir.mkdir();
         long usableSpace = tempDir.getUsableSpace();
         long totalSpace = tempDir.getTotalSpace();
-        final ServerConfiguration conf = new ServerConfiguration()
+        final ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(zkutil.getZooKeeperConnectString())
                 .setZkTimeout(5000).setJournalDirName(tempDir.getPath())
                 .setLedgerDirNames(new String[] { tempDir.getPath() });
@@ -392,7 +392,7 @@ public void testWithDiskError() throws Exception {
         parent.delete();
         parent.mkdir();
         File child = File.createTempFile("DiskCheck", "test", parent);
-        final ServerConfiguration conf = new ServerConfiguration()
+        final ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(zkutil.getZooKeeperConnectString())
                 .setZkTimeout(5000).setJournalDirName(child.getPath())
                 .setLedgerDirNames(new String[] { child.getPath() });

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
@@ -34,6 +34,7 @@
 import org.apache.bookkeeper.client.LedgerEntry;
 import org.apache.bookkeeper.client.LedgerHandle;
 import org.apache.bookkeeper.client.LedgerMetadata;
+import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.apache.bookkeeper.meta.LedgerManager;
 import org.apache.bookkeeper.meta.LedgerManagerFactory;
@@ -362,7 +363,7 @@ public void testCompactionSmallEntryLogs() throws Exception {
     @Test(timeout=60000)
     public void testCompactionSafety() throws Exception {
         tearDown(); // I dont want the test infrastructure
-        ServerConfiguration conf = new ServerConfiguration();
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         final Set<Long> ledgers = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
         LedgerManager manager = getLedgerManager(ledgers);
 
@@ -516,7 +517,7 @@ public LedgerManager.LedgerRange next() throws IOException {
     @Test(timeout = 60000)
     public void testWhenNoLogsToCompact() throws Exception {
         tearDown(); // I dont want the test infrastructure
-        ServerConfiguration conf = new ServerConfiguration();
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         File tmpDir = File.createTempFile("bkTest", ".dir");
         tmpDir.delete();
         tmpDir.mkdir();

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
@@ -366,7 +366,7 @@ public void testRestartWithHostNameAsBookieID() throws Exception {
         String[] ledgerDirs = new String[] { newDirectory(), newDirectory(),
                 newDirectory() };
         String journalDir = newDirectory();
-        ServerConfiguration conf = new ServerConfiguration()
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(zkutil.getZooKeeperConnectString())
                 .setJournalDirName(journalDir).setLedgerDirNames(ledgerDirs)
                 .setBookiePort(bookiePort);
@@ -390,7 +390,7 @@ public void testRestartWithIpAddressAsBookieID() throws Exception {
         String[] ledgerDirs = new String[] { newDirectory(), newDirectory(),
                 newDirectory() };
         String journalDir = newDirectory();
-        ServerConfiguration conf = new ServerConfiguration()
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(zkutil.getZooKeeperConnectString())
                 .setJournalDirName(journalDir).setLedgerDirNames(ledgerDirs)
                 .setBookiePort(bookiePort);
@@ -412,7 +412,7 @@ public void testRestartWithIpAddressAsBookieID() throws Exception {
      */
     @Test(timeout = 60000)
     public void testV2dataWithHostNameAsBookieID() throws Exception {
-        ServerConfiguration conf = new ServerConfiguration()
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
                 .setZkServers(zkutil.getZooKeeperConnectString())
                 .setJournalDirName(newV2JournalDirectory())
                 .setLedgerDirNames(new String[] { newV2LedgerDirectory() })

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java
@@ -33,6 +33,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.apache.bookkeeper.bookie.CheckpointSource.Checkpoint;
 import org.apache.bookkeeper.bookie.LedgerDirsManager.LedgerDirsListener;
@@ -75,7 +76,7 @@ public void teardownExecutor() {
     @Test(timeout=60000)
     public void testSyncThreadLongShutdown() throws Exception {
         int flushInterval = 100;
-        ServerConfiguration conf = new ServerConfiguration().setFlushInterval(flushInterval);
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         CheckpointSource checkpointSource = new DummyCheckpointSource();
         LedgerDirsListener listener = new DummyLedgerDirsListener();
 
@@ -150,7 +151,7 @@ public Boolean call() {
     @Test(timeout=60000)
     public void testSyncThreadSuspension() throws Exception {
         int flushInterval = 100;
-        ServerConfiguration conf = new ServerConfiguration().setFlushInterval(flushInterval);
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         CheckpointSource checkpointSource = new DummyCheckpointSource();
         LedgerDirsListener listener = new DummyLedgerDirsListener();
 
@@ -194,7 +195,7 @@ public Checkpoint checkpoint(Checkpoint checkpoint)
     @Test(timeout=60000)
     public void testSyncThreadShutdownOnError() throws Exception {
         int flushInterval = 100;
-        ServerConfiguration conf = new ServerConfiguration().setFlushInterval(flushInterval);
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         CheckpointSource checkpointSource = new DummyCheckpointSource();
         final CountDownLatch fatalLatch = new CountDownLatch(1);
         LedgerDirsListener listener = new DummyLedgerDirsListener() {
@@ -225,7 +226,7 @@ public Checkpoint checkpoint(Checkpoint checkpoint)
     @Test(timeout=60000)
     public void testSyncThreadDisksFull() throws Exception {
         int flushInterval = 100;
-        ServerConfiguration conf = new ServerConfiguration().setFlushInterval(flushInterval);
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         CheckpointSource checkpointSource = new DummyCheckpointSource();
         final CountDownLatch diskFullLatch = new CountDownLatch(1);
         LedgerDirsListener listener = new DummyLedgerDirsListener() {

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
@@ -28,6 +28,7 @@ public static ServerConfiguration newServerConfiguration() {
         confReturn.setJournalFlushWhenQueueEmpty(true);
         // enable journal format version
         confReturn.setJournalFormatVersionToWrite(5);
+        confReturn.setAllowLoopback(true);
         return confReturn;
     }
 

diff --git a/...erver/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicBookieCheckTest.java b/...erver/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicBookieCheckTest.java
@@ -31,6 +31,7 @@
 import org.apache.bookkeeper.client.LedgerHandleAdapter;
 import org.apache.bookkeeper.client.LedgerMetadata;
 import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.meta.LedgerManager;
 import org.apache.bookkeeper.meta.LedgerManagerFactory;
 import org.apache.bookkeeper.meta.LedgerUnderreplicationManager;
@@ -62,16 +63,14 @@ public class AuditorPeriodicBookieCheckTest extends BookKeeperClusterTestCase {
     public AuditorPeriodicBookieCheckTest() {
         super(3);
         baseConf.setPageLimit(1); // to make it easy to push ledger out of cache
-        baseConf.setAllowLoopback(true);
     }
 
     @Before
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
-        ServerConfiguration conf = new ServerConfiguration(bsConfs.get(0));
-        conf.setAllowLoopback(true);
+        ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         conf.setAuditorPeriodicBookieCheckInterval(CHECK_INTERVAL);
         String addr = bs.get(0).getLocalAddress().toString();
 

diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java b/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
@@ -502,6 +502,7 @@ protected void startBookieServer() throws Exception {
                 getClass().getName() + port, "test");
             org.apache.bookkeeper.conf.ServerConfiguration conf = newServerConfiguration(
                 port, zkUtil.getZooKeeperConnectString(), tmpDir, new File[] { tmpDir });
+            conf.setAllowLoopback(true);
             bks.add(startBookie(conf));
             bkConfs.add(conf);
         }
@@ -510,6 +511,7 @@ protected org.apache.bookkeeper.conf.ServerConfiguration newServerConfiguration(
             int port, String zkServers, File journalDir, File[] ledgerDirs) {
             org.apache.bookkeeper.conf.ServerConfiguration conf =
                 new org.apache.bookkeeper.conf.ServerConfiguration();
+            conf.setAllowLoopback(true);
             conf.setBookiePort(port);
             conf.setZkServers(zkServers);
             conf.setJournalDirName(journalDir.getPath());

diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java b/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
@@ -252,6 +252,7 @@ private static ServerConfiguration newServerConfiguration() {
 
     protected ServerConfiguration newServerConfiguration(int port, String zkServers, File journalDir, File[] ledgerDirs) {
         ServerConfiguration conf = new ServerConfiguration(baseConf);
+        conf.setAllowLoopback(true);
         conf.setBookiePort(port);
         conf.setZkServers(zkServers);
         conf.setJournalDirName(journalDir.getPath());