Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7AAB59BF1 for ; Wed, 8 Feb 2012 10:41:10 +0000 (UTC) Received: (qmail 69735 invoked by uid 500); 8 Feb 2012 10:41:09 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 69658 invoked by uid 500); 8 Feb 2012 10:41:06 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 69649 invoked by uid 99); 8 Feb 2012 10:41:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Feb 2012 10:41:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Feb 2012 10:41:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E65D423889B8 for ; Wed, 8 Feb 2012 10:40:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1241855 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java Date: Wed, 08 Feb 2012 10:40:43 -0000 To: commits@zookeeper.apache.org From: ivank@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120208104043.E65D423889B8@eris.apache.org> Author: ivank Date: Wed Feb 8 10:40:43 2012 New Revision: 1241855 URL: http://svn.apache.org/viewvc?rev=1241855&view=rev Log: BOOKKEEPER-156: BookieJournalRollingTest failing (Sijie Guo via ivank) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1241855&r1=1241854&r2=1241855&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Feb 8 10:40:43 2012 @@ -30,6 +30,8 @@ Trunk (unreleased changes) BOOKKEEPER-167: PerChannelBookieClient doesn't use ClientConfiguration (Sijie Guo via ivank) + BOOKKEEPER-156: BookieJournalRollingTest failing (Sijie Guo via ivank) + hedwig-server/ BOOKKEEPER-140: Hub server doesn't subscribe remote region correctly when a region is down. (Sijie Gou via ivank) Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java?rev=1241855&r1=1241854&r2=1241855&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java Wed Feb 8 10:40:43 2012 @@ -128,6 +128,11 @@ public abstract class BaseTestCase exten zkc.create("/ledgers", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); zkc.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + baseClientConf.setZkServers("127.0.0.1"); + if (numBookies > 0) { + bkc = new BookKeeperTestClient(baseClientConf); + } + // Create Bookie Servers (B1, B2, B3) for (int i = 0; i < numBookies; i++) { File f = File.createTempFile("bookie", "test"); @@ -139,14 +144,7 @@ public abstract class BaseTestCase exten initialPort + i, HOSTPORT, f, new File[] { f }); bsConfs.add(conf); - BookieServer server = new BookieServer(conf); - server.start(); - bs.add(server); - } - - baseClientConf.setZkServers("127.0.0.1"); - if (numBookies > 0) { - bkc = new BookKeeperTestClient(baseClientConf); + bs.add(startBookie(conf)); } } catch(Exception e) { LOG.error("Error setting up", e); @@ -223,9 +221,7 @@ public abstract class BaseTestCase exten if (null != newConf) { conf.loadConf(newConf); } - BookieServer server = new BookieServer(conf); - server.start(); - bs.add(server); + bs.add(startBookie(conf)); j++; } } @@ -247,16 +243,29 @@ public abstract class BaseTestCase exten ServerConfiguration conf = newServerConfiguration(port, HOSTPORT, f, new File[] { f }); + bs.add(startBookie(conf)); + } + + /** + * Helper method to startup a bookie server using a configuration object + * + * @param conf + * Server Configuration Object + * + */ + private BookieServer startBookie(ServerConfiguration conf) + throws IOException, InterruptedException, KeeperException { BookieServer server = new BookieServer(conf); server.start(); - bs.add(server); + int port = conf.getBookiePort(); while(bkc.getZkHandle().exists("/ledgers/available/" + InetAddress.getLocalHost().getHostAddress() + ":" + port, false) == null) { Thread.sleep(500); } bkc.readBookiesBlocking(); LOG.info("New bookie on port " + port + " has been created."); + return server; } @After