Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 2912 invoked from network); 23 Feb 2009 23:56:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Feb 2009 23:56:04 -0000 Received: (qmail 1742 invoked by uid 500); 23 Feb 2009 23:56:04 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 1716 invoked by uid 500); 23 Feb 2009 23:56:04 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 1705 invoked by uid 99); 23 Feb 2009 23:56:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Feb 2009 15:56:04 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Feb 2009 23:56:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D7D523888A3; Mon, 23 Feb 2009 23:55:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747224 - in /hadoop/zookeeper/branches/branch-3.1: CHANGES.txt src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java Date: Mon, 23 Feb 2009 23:55:42 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090223235543.7D7D523888A3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Mon Feb 23 23:55:41 2009 New Revision: 747224 URL: http://svn.apache.org/viewvc?rev=747224&view=rev Log: ZOOKEEPER-326. standalone server ignores tickTime configuration (chris darroch via mahadev) Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/CHANGES.txt?rev=747224&r1=747223&r2=747224&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.1/CHANGES.txt Mon Feb 23 23:55:41 2009 @@ -1,3 +1,20 @@ +Fix release + +Non-backward compatible changes: + +BUGFIXES: + +Backward compatibile changes: + +BUGFIXES: + + ZOOKEEPER-326. standalone server ignores tickTime configuration (chris +darroch via mahadev) + +IMPROVEMENTS: + +NEW FEATURES: + Release 3.1.0 - 2009-02-11 Non-backward compatible changes: Modified: hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java?rev=747224&r1=747223&r2=747224&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java (original) +++ hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java Mon Feb 23 23:55:41 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; } });