ZOOKEEPER-326. standalone server ignores tickTime configuration. (chris darroch via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@747222 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -13,6 +13,9 @@ IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x. (breed via
 mahadev)
 
+ ZOOKEEPER-326. standalone server ignores tickTime configuration. (chris
+darroch via mahadev)
+
 NEW FEATURES:
 
 

src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java

@@ -26,6 +26,7 @@ import javax.management.JMException;
 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 @@ public class ZooKeeperServerMain {
         }
 
         try {
-            ServerConfig.parse(args);
+            QuorumPeerConfig.parse(args);
         } catch(Exception e) {
             LOG.fatal("Error in config", e);
             LOG.info(USAGE);
@@ -66,6 +67,7 @@ public class ZooKeeperServerMain {
                        File(ServerConfig.getDataLogDir()),
                         new File(ServerConfig.getDataDir()));
                zks.setTxnLogFactory(ftxn);
+               zks.setTickTime(QuorumPeerConfig.getTickTime());
                return zks;
             }
         });