You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2009/02/24 00:52:07 UTC
svn commit: r747222 - in /hadoop/zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
Author: mahadev
Date: Mon Feb 23 23:52:04 2009
New Revision: 747222
URL: http://svn.apache.org/viewvc?rev=747222&view=rev
Log:
ZOOKEEPER-326. standalone server ignores tickTime configuration. (chris darroch via mahadev)
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=747222&r1=747221&r2=747222&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Feb 23 23:52:04 2009
@@ -13,6 +13,9 @@
ZOOKEEPER-308. improve the atomic broadcast performance 3x. (breed via
mahadev)
+ ZOOKEEPER-326. standalone server ignores tickTime configuration. (chris
+darroch via mahadev)
+
NEW FEATURES:
Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java?rev=747222&r1=747221&r2=747222&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java (original)
+++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java Mon Feb 23 23:52:04 2009
@@ -26,6 +26,7 @@
import org.apache.log4j.Logger;
import org.apache.zookeeper.jmx.ManagedUtil;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
/**
* This class starts and runs a standalone ZooKeeperServer.
@@ -47,7 +48,7 @@
}
try {
- ServerConfig.parse(args);
+ QuorumPeerConfig.parse(args);
} catch(Exception e) {
LOG.fatal("Error in config", e);
LOG.info(USAGE);
@@ -66,6 +67,7 @@
File(ServerConfig.getDataLogDir()),
new File(ServerConfig.getDataDir()));
zks.setTxnLogFactory(ftxn);
+ zks.setTickTime(QuorumPeerConfig.getTickTime());
return zks;
}
});