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 2012/12/08 11:42:52 UTC
svn commit: r1418638 - in /zookeeper/bookkeeper/trunk/bookkeeper-server/src:
main/java/org/apache/bookkeeper/meta/ main/java/org/apache/bookkeeper/util/
test/java/org/apache/bookkeeper/replication/
Author: fpj
Date: Sat Dec 8 10:42:51 2012
New Revision: 1418638
URL: http://svn.apache.org/viewvc?rev=1418638&view=rev
Log:
BOOKKEEPER-431: Duplicate definition of COOKIES_NODE (uma via fpj).
Additional commit to fix the DEFAULT_ZK_LEDGERS_ROOT_PATH constant.
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java?rev=1418638&r1=1418637&r2=1418638&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java Sat Dec 8 10:42:51 2012
@@ -106,7 +106,7 @@ public class ZkLedgerUnderreplicationMan
+ BookKeeperConstants.UNDER_REPLICATION_NODE;
layoutZNode = basePath + '/' + BookKeeperConstants.LAYOUT_ZNODE;
urLedgerPath = basePath
- + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
+ + BookKeeperConstants.DEFAULT_ZK_LEDGERS_ROOT_PATH;
urLockPath = basePath + "/locks";
idExtractionPattern = Pattern.compile("urL(\\d+)$");
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java?rev=1418638&r1=1418637&r2=1418638&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java Sat Dec 8 10:42:51 2012
@@ -39,7 +39,7 @@ public class BookKeeperConstants {
public static final String COOKIE_NODE = "cookies";
public static final String UNDER_REPLICATION_NODE = "underreplication";
public static final String DISABLE_NODE = "disable";
- public static final String ZK_LEDGERS_ROOT_PATH_DEFAULT = "/ledgers";
+ public static final String DEFAULT_ZK_LEDGERS_ROOT_PATH = "/ledgers";
public static final String LAYOUT_ZNODE = "LAYOUT";
public static final String INSTANCEID = "INSTANCEID";
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java?rev=1418638&r1=1418637&r2=1418638&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java Sat Dec 8 10:42:51 2012
@@ -106,7 +106,7 @@ public class TestLedgerUnderreplicationM
basePath = conf.getZkLedgersRootPath() + '/'
+ BookKeeperConstants.UNDER_REPLICATION_NODE;
urLedgerPath = basePath
- + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
+ + BookKeeperConstants.DEFAULT_ZK_LEDGERS_ROOT_PATH;
}
@After
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java?rev=1418638&r1=1418637&r2=1418638&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java Sat Dec 8 10:42:51 2012
@@ -69,7 +69,7 @@ public class TestReplicationWorker exten
baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
basePath = baseClientConf.getZkLedgersRootPath() + '/'
+ BookKeeperConstants.UNDER_REPLICATION_NODE
- + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
+ + BookKeeperConstants.DEFAULT_ZK_LEDGERS_ROOT_PATH;
baseConf.setRereplicationEntryBatchSize(3);
}