You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/02/15 10:58:37 UTC
svn commit: r1244421 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
Author: sijie
Date: Wed Feb 15 09:58:37 2012
New Revision: 1244421
URL: http://svn.apache.org/viewvc?rev=1244421&view=rev
Log:
BOOKKEEPER-171: ServerConfiguration can't use more than one directory for ledgers
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1244421&r1=1244420&r2=1244421&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Feb 15 09:58:37 2012
@@ -36,6 +36,8 @@ Trunk (unreleased changes)
BOOKKEEPER-152: Can't recover a ledger whose current ensemble contain failed bookie. (ivank)
+ BOOKKEEPER-171: ServerConfiguration can't use more than one directory for ledgers. (ivank via sijie)
+
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/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java?rev=1244421&r1=1244420&r2=1244421&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java Wed Feb 15 09:58:37 2012
@@ -19,8 +19,6 @@ package org.apache.bookkeeper.conf;
import java.io.File;
-import org.apache.commons.lang.StringUtils;
-
/**
* Configuration manages server-side settings
*/
@@ -53,9 +51,6 @@ public class ServerConfiguration extends
// Statistics Parameters
protected final static String ENABLE_STATISTICS = "enableStatistics";
- // separator for ledger dir
- protected final static String SEP = ",";
-
/**
* Construct a default configuration object
*/
@@ -275,11 +270,11 @@ public class ServerConfiguration extends
* @return ledger dir names, if not provided return null
*/
public String[] getLedgerDirNames() {
- String ledgerDirs = this.getString(LEDGER_DIRS, "/tmp/bk-data");
+ String[] ledgerDirs = this.getStringArray(LEDGER_DIRS);
if (null == ledgerDirs) {
- return null;
+ return new String[] { "/tmp/bk-data" };
}
- return ledgerDirs.split(SEP);
+ return ledgerDirs;
}
/**
@@ -293,7 +288,7 @@ public class ServerConfiguration extends
if (null == ledgerDirs) {
return this;
}
- this.setProperty(LEDGER_DIRS, StringUtils.join(ledgerDirs, SEP));
+ this.setProperty(LEDGER_DIRS, ledgerDirs);
return this;
}