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 2011/11/28 17:32:29 UTC
svn commit: r1207396 - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-server/conf/
bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ doc/
Author: fpj
Date: Mon Nov 28 16:32:27 2011
New Revision: 1207396
URL: http://svn.apache.org/viewvc?rev=1207396&view=rev
Log:
BOOKKEEPER-119: Keys in configuration have inconsistent style (ivank via fpj)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bk_server.conf
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
zookeeper/bookkeeper/trunk/doc/bookkeeperConfig.textile
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1207396&r1=1207395&r2=1207396&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Nov 28 16:32:27 2011
@@ -131,3 +131,6 @@ IMPROVEMENTS:
BOOKKEEPER-109: Add documentation to describe how bookies flushes data (Sijie Guo via fpj)
BOOKKEEPER-90: Hedwig API changes for initial Bookkeeper release (ivank via fpj)
+
+ BOOKKEEPER-119: Keys in configuration have inconsistent style (ivank via fpj)
+
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bk_server.conf
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bk_server.conf?rev=1207396&r1=1207395&r2=1207396&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bk_server.conf (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bk_server.conf Mon Nov 28 16:32:27 2011
@@ -23,20 +23,20 @@
## Bookie settings
# Port that bookie server listen on
-bookie_port=3181
+bookiePort=3181
# Directory Bookkeeper outputs its write ahead log
-journal_dir=/tmp/bk-txn
+journalDirectory=/tmp/bk-txn
# Directory Bookkeeper outputs ledger snapshots
# could define multi directories to store snapshots, separated by ','
# For example:
-# ledger_dirs=/tmp/bk1-data,/tmp/bk2-data
+# ledgerDirectories=/tmp/bk1-data,/tmp/bk2-data
#
# Ideally ledger dirs and journal dir are each in a differet device,
# which reduce the contention between random i/o and sequential write.
# It is possible to run with a single disk, but performance will be significantly lower.
-ledger_dirs=/tmp/bk-data
+ledgerDirectories=/tmp/bk-data
# Max file size of entry logger, in bytes
# A new entry log file will be created when the old one reaches the file size limitation
@@ -44,11 +44,13 @@ ledger_dirs=/tmp/bk-data
# Max file size of journal file, in mega bytes
# A new journal file will be created when the old one reaches the file size limitation
-# journal_max_size_mb=2048
+#
+# journalMaxSizeMB=2048
# Max number of old journal file to kept
# Keep a number of old journal files would help data recovery in specia case
-# journal_max_backups=5
+#
+# journalMaxBackups=5
# How long the interval to trigger next garbage collection, in milliseconds
# Since garbage collection is running in background, too frequent gc
@@ -64,10 +66,12 @@ ledger_dirs=/tmp/bk-data
# on too frequent flushing. You can consider increment flush interval
# to get better performance, but you need to pay more time on bookie
# server restart after failure.
-# flush_interval=100
+#
+# flushInterval=100
# Interval to watch whether bookie is dead or not, in milliseconds
-# bookie_death_watch_interval=1000
+#
+# bookieDeathWatchInterval=1000
## zookeeper client settings
@@ -91,7 +95,8 @@ zkTimeout=10000
# a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm
# can provide better performance.
# Default value is true.
-# server.tcpnodelay=true
+#
+# serverTcpNoDelay=true
## ledger cache settings
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java?rev=1207396&r1=1207395&r2=1207396&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java Mon Nov 28 16:32:27 2011
@@ -37,7 +37,7 @@ public class ClientConfiguration extends
protected final static String PASSWD = "passwd";
// NIO Parameters
- protected final static String CLIENT_TCP_NODELAY = "client.tcpnodelay";
+ protected final static String CLIENT_TCP_NODELAY = "clientTcpNoDelay";
/**
* Construct a default client-side configuration
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=1207396&r1=1207395&r2=1207396&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 Mon Nov 28 16:32:27 2011
@@ -31,22 +31,22 @@ public class ServerConfiguration extends
// Gc Parameters
protected final static String GC_WAIT_TIME = "gcWaitTime";
// Sync Parameters
- protected final static String FLUSH_INTERVAL = "flush_interval";
+ protected final static String FLUSH_INTERVAL = "flushInterval";
// Bookie death watch interval
- protected final static String DEATH_WATCH_INTERVAL = "bookie_death_watch_interval";
+ protected final static String DEATH_WATCH_INTERVAL = "bookieDeathWatchInterval";
// Ledger Cache Parameters
protected final static String OPEN_FILE_LIMIT = "openFileLimit";
protected final static String PAGE_LIMIT = "pageLimit";
protected final static String PAGE_SIZE = "pageSize";
// Journal Parameters
- protected final static String MAX_JOURNAL_SIZE = "journal_max_size_mb";
- protected final static String MAX_BACKUP_JOURNALS = "journal_max_backups";
+ protected final static String MAX_JOURNAL_SIZE = "journalMaxSizeMB";
+ protected final static String MAX_BACKUP_JOURNALS = "journalMaxBackups";
// Bookie Parameters
- protected final static String BOOKIE_PORT = "bookie_port";
- protected final static String JOURNAL_DIR = "journal_dir";
- protected final static String LEDGER_DIRS = "ledger_dirs";
+ protected final static String BOOKIE_PORT = "bookiePort";
+ protected final static String JOURNAL_DIR = "journalDirectory";
+ protected final static String LEDGER_DIRS = "ledgerDirectories";
// NIO Parameters
- protected final static String SERVER_TCP_NODELAY = "server.tcpnodelay";
+ protected final static String SERVER_TCP_NODELAY = "serverTcpNoDelay";
// Zookeeper Parameters
protected final static String ZK_TIMEOUT = "zkTimeout";
protected final static String ZK_SERVERS = "zkServers";
Modified: zookeeper/bookkeeper/trunk/doc/bookkeeperConfig.textile
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/doc/bookkeeperConfig.textile?rev=1207396&r1=1207395&r2=1207396&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/doc/bookkeeperConfig.textile (original)
+++ zookeeper/bookkeeper/trunk/doc/bookkeeperConfig.textile Mon Nov 28 16:32:27 2011
@@ -62,10 +62,10 @@ p. LastLogMark contains two parts:
p. You may use following settings to further fine tune the behavior of your Bookie servers. Currently these configuration settings are set using Java system properties.
-* journal_max_size_mb
+* journalMaxSizeMB
** journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.
-* journal_max_backups
+* journalMaxBackups
** how many old journal files whose id is less than LastLogMark 's journal id.
bq. NOTE: keeping number of old journal files would be useful for manually recovery in special case.