You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2014/06/06 15:32:16 UTC
svn commit: r1600884 - in /zookeeper/bookkeeper/branches/branch-4.2: ./
bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/
bookkeeper-server/src/test/java/org/apache/bookkeep...
Author: fpj
Date: Fri Jun 6 13:32:15 2014
New Revision: 1600884
URL: http://svn.apache.org/r1600884
Log:
BOOKKEEPER-767: Allow loopback in tests (ivank via fpj)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Jun 6 13:32:15 2014
@@ -6,6 +6,8 @@ Release 4.2.3 - 2013-12-04
BOOKKEEPER-766: Update notice.txt files to include 2014 (ivank via fpj)
+ BOOKKEEPER-767: Allow loopback in tests (ivank via fpj)
+
bookkeeper-server:
BOOKKEEPER-711: bookkeeper-daemon.sh will not remove the pid file one successful stop (vinay via sijie)
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java Fri Jun 6 13:32:15 2014
@@ -97,8 +97,8 @@ public class BookieInitializationTest {
tmpDir.mkdir();
final ServerConfiguration conf = new ServerConfiguration()
- .setZkServers(null).setJournalDirName(tmpDir.getPath())
- .setLedgerDirNames(new String[] { tmpDir.getPath() });
+ .setZkServers(null).setJournalDirName(tmpDir.getPath())
+ .setAllowLoopback(true).setLedgerDirNames(new String[] { tmpDir.getPath() });
// simulating ZooKeeper exception by assigning a closed zk client to bk
BookieServer bkServer = new BookieServer(conf) {
@@ -130,8 +130,8 @@ public class BookieInitializationTest {
tmpDir.mkdir();
final ServerConfiguration conf = new ServerConfiguration()
- .setZkServers(null).setJournalDirName(tmpDir.getPath())
- .setLedgerDirNames(new String[] { tmpDir.getPath() });
+ .setZkServers(null).setJournalDirName(tmpDir.getPath())
+ .setAllowLoopback(true).setLedgerDirNames(new String[] { tmpDir.getPath() });
final String bkRegPath = conf.getZkAvailableBookiesPath() + "/"
+ InetAddress.getLocalHost().getHostAddress() + ":"
@@ -196,8 +196,9 @@ public class BookieInitializationTest {
tmpDir.mkdir();
ServerConfiguration conf = new ServerConfiguration().setZkServers(null)
- .setJournalDirName(tmpDir.getPath()).setLedgerDirNames(
- new String[] { tmpDir.getPath() });
+ .setAllowLoopback(true)
+ .setJournalDirName(tmpDir.getPath())
+ .setLedgerDirNames(new String[] { tmpDir.getPath() });
String bkRegPath = conf.getZkAvailableBookiesPath() + "/"
+ InetAddress.getLocalHost().getHostAddress() + ":"
@@ -252,9 +253,10 @@ public class BookieInitializationTest {
ServerConfiguration conf = new ServerConfiguration();
int port = 12555;
- conf.setZkServers(null).setBookiePort(port).setJournalDirName(
- tmpDir.getPath()).setLedgerDirNames(
- new String[] { tmpDir.getPath() });
+ conf.setZkServers(null).setBookiePort(port)
+ .setAllowLoopback(true)
+ .setJournalDirName(tmpDir.getPath())
+ .setLedgerDirNames(new String[] { tmpDir.getPath() });
BookieServer bs1 = new BookieServer(conf);
bs1.start();
@@ -281,9 +283,9 @@ public class BookieInitializationTest {
tmpDir.mkdir();
final ServerConfiguration conf = new ServerConfiguration()
- .setZkServers(zkutil.getZooKeeperConnectString())
- .setZkTimeout(5000).setJournalDirName(tmpDir.getPath())
- .setLedgerDirNames(new String[] { tmpDir.getPath() });
+ .setZkServers(zkutil.getZooKeeperConnectString())
+ .setZkTimeout(5000).setJournalDirName(tmpDir.getPath())
+ .setAllowLoopback(true).setLedgerDirNames(new String[] { tmpDir.getPath() });
try {
new Bookie(conf);
fail("Should throw ConnectionLossException as ZKServer is not running!");
@@ -308,6 +310,7 @@ public class BookieInitializationTest {
final ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
.setZkTimeout(5000).setJournalDirName(tmpDir.getPath())
+ .setAllowLoopback(true)
.setLedgerDirNames(new String[] { tmpDir.getPath() });
conf.setZkLedgersRootPath(ZK_ROOT);
try {
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java Fri Jun 6 13:32:15 2014
@@ -216,6 +216,7 @@ public class BookieJournalTest {
writeIndexFileForLedger(Bookie.getCurrentDirectory(ledgerDir), 1, "testPasswd".getBytes());
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -254,6 +255,7 @@ public class BookieJournalTest {
writeJunkJournal(Bookie.getCurrentDirectory(journalDir));
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -292,6 +294,7 @@ public class BookieJournalTest {
writePreV2Journal(Bookie.getCurrentDirectory(journalDir), 0);
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -318,6 +321,7 @@ public class BookieJournalTest {
writePostV2Journal(Bookie.getCurrentDirectory(journalDir), 0);
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -348,6 +352,7 @@ public class BookieJournalTest {
writeIndexFileForLedger(ledgerDir, 1, "testPasswd".getBytes());
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -392,6 +397,7 @@ public class BookieJournalTest {
1, "testPasswd".getBytes());
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -440,6 +446,7 @@ public class BookieJournalTest {
1, "testPasswd".getBytes());
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -506,6 +513,7 @@ public class BookieJournalTest {
1, "testPasswd".getBytes(), truncateMasterKey);
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -568,6 +576,7 @@ public class BookieJournalTest {
truncateMasterKey);
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java Fri Jun 6 13:32:15 2014
@@ -317,7 +317,7 @@ public class CompactionTest extends Book
@Test(timeout=60000)
public void testCompactionSafety() throws Exception {
tearDown(); // I dont want the test infrastructure
- ServerConfiguration conf = new ServerConfiguration();
+ ServerConfiguration conf = new ServerConfiguration().setAllowLoopback(true);
final Set<Long> ledgers = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
LedgerManager manager = new LedgerManager() {
@Override
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java Fri Jun 6 13:32:15 2014
@@ -78,6 +78,7 @@ public class CookieTest {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newDirectory(false))
+ .setAllowLoopback(true)
.setLedgerDirNames(new String[] { newDirectory(false) })
.setBookiePort(bookiePort);
try {
@@ -95,6 +96,7 @@ public class CookieTest {
@Test(timeout=60000)
public void testBadJournalCookie() throws Exception {
ServerConfiguration conf1 = new ServerConfiguration()
+ .setAllowLoopback(true)
.setJournalDirName(newDirectory())
.setLedgerDirNames(new String[] { newDirectory() })
.setBookiePort(bookiePort);
@@ -104,6 +106,7 @@ public class CookieTest {
String journalDir = newDirectory();
String ledgerDir = newDirectory();
ServerConfiguration conf2 = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir })
@@ -131,6 +134,7 @@ public class CookieTest {
newDirectory(), newDirectory(), newDirectory() };
String journalDir = newDirectory();
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(journalDir)
.setLedgerDirNames(ledgerDirs)
@@ -172,6 +176,7 @@ public class CookieTest {
String ledgerDir0 = newDirectory();
String journalDir = newDirectory();
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir0 })
@@ -204,6 +209,7 @@ public class CookieTest {
String ledgerDir0 = newDirectory();
String journalDir = newDirectory();
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir0 , newDirectory() })
@@ -229,6 +235,7 @@ public class CookieTest {
@Test(timeout=60000)
public void testBookiePortChanged() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newDirectory())
.setLedgerDirNames(new String[] { newDirectory() , newDirectory() })
@@ -255,6 +262,7 @@ public class CookieTest {
@Test(timeout=60000)
public void testNewBookieStartingWithAnotherBookiesPort() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newDirectory())
.setLedgerDirNames(new String[] { newDirectory() , newDirectory() })
@@ -264,6 +272,7 @@ public class CookieTest {
b.shutdown();
conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newDirectory())
.setLedgerDirNames(new String[] { newDirectory() , newDirectory() })
@@ -289,10 +298,11 @@ public class CookieTest {
BookKeeperAdmin.format(adminConf, false, true);
ServerConfiguration bookieConf = new ServerConfiguration()
- .setZkServers(zkutil.getZooKeeperConnectString())
- .setJournalDirName(newDirectory(false))
- .setLedgerDirNames(new String[] { newDirectory(false) })
- .setBookiePort(bookiePort);
+ .setAllowLoopback(true)
+ .setZkServers(zkutil.getZooKeeperConnectString())
+ .setJournalDirName(newDirectory(false))
+ .setLedgerDirNames(new String[] { newDirectory(false) })
+ .setBookiePort(bookiePort);
// Bookie should start successfully for fresh env.
new Bookie(bookieConf);
@@ -320,6 +330,7 @@ public class CookieTest {
@Test(timeout=60000)
public void testV2data() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newV2JournalDirectory())
.setLedgerDirNames(new String[] { newV2LedgerDirectory() })
@@ -340,6 +351,7 @@ public class CookieTest {
@Test(timeout=60000)
public void testV1data() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(newV1JournalDirectory())
.setLedgerDirNames(new String[] { newV1LedgerDirectory() })
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java Fri Jun 6 13:32:15 2014
@@ -82,6 +82,7 @@ public class CreateNewLogTest {
// Creating a new configuration with a number of
// ledger directories.
conf.setLedgerDirNames(ledgerDirs);
+ conf.setAllowLoopback(true);
LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(conf);
EntryLogger el = new EntryLogger(conf, ledgerDirsManager);
@@ -99,4 +100,4 @@ public class CreateNewLogTest {
Assert.assertTrue("Wrong log id", el.getCurrentLogId() > 1);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java Fri Jun 6 13:32:15 2014
@@ -56,6 +56,7 @@ public class EntryLogTest extends TestCa
int gcWaitTime = 1000;
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
@@ -107,6 +108,7 @@ public class EntryLogTest extends TestCa
Bookie.checkDirectoryStructure(curDir);
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
// create some entries
@@ -168,6 +170,7 @@ public class EntryLogTest extends TestCa
File tmpDir = File.createTempFile("bkTest", ".dir");
tmpDir.delete();
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setLedgerDirNames(new String[] { tmpDir.toString() });
EntryLogger entryLogger = null;
try {
@@ -193,6 +196,7 @@ public class EntryLogTest extends TestCa
File ledgerDir2 = File.createTempFile("bkTest", ".dir");
ledgerDir2.delete();
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(),
ledgerDir2.getAbsolutePath() });
Bookie bookie = new Bookie(conf);
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java Fri Jun 6 13:32:15 2014
@@ -73,6 +73,7 @@ public class LedgerCacheTest extends Tes
conf = new ServerConfiguration();
conf.setZkServers(null);
+ conf.setAllowLoopback(true);
conf.setJournalDirName(txnDir.getPath());
conf.setLedgerDirNames(new String[] { ledgerDir.getPath() });
bookie = new Bookie(conf);
@@ -214,6 +215,8 @@ public class LedgerCacheTest extends Tes
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(),
ledgerDir2.getAbsolutePath() });
conf.setOpenFileLimit(1);
+ conf.setAllowLoopback(true);
+
Bookie bookie = new Bookie(conf);
InterleavedLedgerStorage ledgerStorage = ((InterleavedLedgerStorage) bookie.ledgerStorage);
final LedgerCacheImpl ledgerCache = (LedgerCacheImpl) ledgerStorage.ledgerCache;
@@ -306,7 +309,7 @@ public class LedgerCacheTest extends Tes
ledgerDir1.delete();
File ledgerDir2 = File.createTempFile("bkTest", ".dir");
ledgerDir2.delete();
- ServerConfiguration conf = new ServerConfiguration();
+ ServerConfiguration conf = new ServerConfiguration().setAllowLoopback(true);
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(), ledgerDir2.getAbsolutePath() });
Bookie bookie = new Bookie(conf);
@@ -364,6 +367,7 @@ public class LedgerCacheTest extends Tes
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(null)
+ .setAllowLoopback(true)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() })
.setFlushInterval(1000)
@@ -377,6 +381,7 @@ public class LedgerCacheTest extends Tes
}
conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(null)
.setJournalDirName(journalDir.getPath())
.setLedgerDirNames(new String[] { ledgerDir.getPath() });
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java Fri Jun 6 13:32:15 2014
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class TestLedgerDirsManager extends TestCase {
static Logger LOG = LoggerFactory.getLogger(TestLedgerDirsManager.class);
- ServerConfiguration conf = new ServerConfiguration();
+ ServerConfiguration conf;
File curDir;
LedgerDirsManager dirsManager;
@@ -48,6 +48,7 @@ public class TestLedgerDirsManager exten
Bookie.checkDirectoryStructure(curDir);
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
dirsManager = new LedgerDirsManager(conf);
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java Fri Jun 6 13:32:15 2014
@@ -165,6 +165,7 @@ public class UpgradeTest {
private static void testUpgradeProceedure(String zkServers, String journalDir, String ledgerDir) throws Exception {
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkServers)
.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir })
@@ -222,6 +223,7 @@ public class UpgradeTest {
testUpgradeProceedure(zkutil.getZooKeeperConnectString(), journalDir, ledgerDir);
// Upgrade again
ServerConfiguration conf = new ServerConfiguration()
+ .setAllowLoopback(true)
.setZkServers(zkutil.getZooKeeperConnectString())
.setJournalDirName(journalDir)
.setLedgerDirNames(new String[] { ledgerDir })
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java Fri Jun 6 13:32:15 2014
@@ -92,7 +92,9 @@ public class TestLedgerUnderreplicationM
zkUtil = new ZooKeeperUtil();
zkUtil.startServer();
- conf = new ServerConfiguration().setZkServers(zkUtil.getZooKeeperConnectString());
+ conf = new ServerConfiguration()
+ .setAllowLoopback(true)
+ .setZkServers(zkUtil.getZooKeeperConnectString());
executor = Executors.newCachedThreadPool();
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java Fri Jun 6 13:32:15 2014
@@ -53,7 +53,7 @@ public class BookieClientTest extends Te
public int port = 13645;
public ClientSocketChannelFactory channelFactory;
public OrderedSafeExecutor executor;
- ServerConfiguration conf = new ServerConfiguration();
+ ServerConfiguration conf;
@Override
public void setUp() throws Exception {
@@ -67,6 +67,7 @@ public class BookieClientTest extends Te
ServerConfiguration conf = new ServerConfiguration();
conf.setZkServers(null).setBookiePort(port)
.setJournalDirName(tmpDir.getPath())
+ .setAllowLoopback(true)
.setLedgerDirNames(new String[] { tmpDir.getPath() });
bs = new BookieServer(conf);
bs.start();
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java Fri Jun 6 13:32:15 2014
@@ -201,6 +201,7 @@ public class BookieJournalRollingTest ex
// set flush interval to a large value
ServerConfiguration newConf = new ServerConfiguration();
+ newConf.setAllowLoopback(true);
newConf.setFlushInterval(999999999);
// restart bookies
restartBookies(newConf);
@@ -239,6 +240,7 @@ public class BookieJournalRollingTest ex
// restart bookies with flush interval set to a large value
ServerConfiguration newConf = new ServerConfiguration();
newConf.setFlushInterval(999999999);
+ newConf.setAllowLoopback(true);
// restart bookies
restartBookies(newConf);
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java Fri Jun 6 13:32:15 2014
@@ -50,7 +50,7 @@ public class ConcurrentLedgerTest extend
File txnDir, ledgerDir;
int recvTimeout = 10000;
Semaphore throttle;
- ServerConfiguration conf = new ServerConfiguration();
+ ServerConfiguration conf;
@Override
@Before
@@ -71,6 +71,8 @@ public class ConcurrentLedgerTest extend
ledgerDir = new File(tmpFile.getParent(), tmpFile.getName()+".dir");
ledgerDir.mkdirs();
+ conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
conf.setBookiePort(5000);
conf.setZkServers(null);
conf.setJournalDirName(txnDir.getPath());
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java Fri Jun 6 13:32:15 2014
@@ -47,6 +47,7 @@ public class NIOServerFactoryTest extend
@Test(timeout=60000)
public void testProblemProcessor() throws Exception {
ServerConfiguration conf = new ServerConfiguration();
+ conf.setAllowLoopback(true);
int port = PortManager.nextFreePort();
conf.setBookiePort(port);
NIOServerFactory factory = new NIOServerFactory(conf, problemProcessor);
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java Fri Jun 6 13:32:15 2014
@@ -267,6 +267,7 @@ public class TestBackwardCompat {
ServerCurrent(File journalDir, File ledgerDir, int port) throws Exception {
conf = new org.apache.bookkeeper.conf.ServerConfiguration();
conf.setBookiePort(port);
+ conf.setAllowLoopback(true);
conf.setZkServers(zkUtil.getZooKeeperConnectString());
conf.setJournalDirName(journalDir.getPath());
conf.setLedgerDirNames(new String[] { ledgerDir.getPath() });
@@ -614,4 +615,4 @@ public class TestBackwardCompat {
scur.stop();
}
-}
\ No newline at end of file
+}
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java Fri Jun 6 13:32:15 2014
@@ -502,6 +502,7 @@ public class TestBackwardCompat extends
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 @@ public class TestBackwardCompat extends
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());
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java?rev=1600884&r1=1600883&r2=1600884&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java Fri Jun 6 13:32:15 2014
@@ -244,6 +244,7 @@ public class BookKeeperTestBase extends
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());