Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 45485 invoked from network); 5 Mar 2009 21:32:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Mar 2009 21:32:45 -0000 Received: (qmail 78610 invoked by uid 500); 5 Mar 2009 21:32:44 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 78578 invoked by uid 500); 5 Mar 2009 21:32:44 -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 78548 invoked by uid 99); 5 Mar 2009 21:32:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 13:32:44 -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; Thu, 05 Mar 2009 21:32:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0D25B2388964; Thu, 5 Mar 2009 21:32:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750597 - in /hadoop/zookeeper/branches/branch-3.1: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java Date: Thu, 05 Mar 2009 21:32:19 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090305213220.0D25B2388964@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Thu Mar 5 21:32:15 2009 New Revision: 750597 URL: http://svn.apache.org/viewvc?rev=750597&view=rev Log: ZOOKEEPER-279. Allow specialization of quorum config parsing (e.g. variable expansion in zoo.cfg) Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.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=750597&r1=750596&r2=750597&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.1/CHANGES.txt Thu Mar 5 21:32:15 2009 @@ -8,22 +8,26 @@ BUGFIXES: - ZOOKEEPER-326. standalone server ignores tickTime configuration (chris -darroch via mahadev) + ZOOKEEPER-326. standalone server ignores tickTime configuration + (chris darroch via mahadev) - ZOOKEEPER-330. zookeeper standalone server does not startup with just a port -and datadir. (chris darroch and mahadev) + ZOOKEEPER-330. zookeeper standalone server does not startup with just a + port and datadir. (chris darroch and mahadev) - ZOOKEEPER-319. add locking around auth info in zhandle_t (chris darroch via -mahadev) + ZOOKEEPER-319. add locking around auth info in zhandle_t + (chris darroch via mahadev) - ZOOKEEPER-320. call auth completion in free_completions(). (chris darroch -via mahadev) + ZOOKEEPER-320. call auth completion in free_completions(). + (chris darroch via mahadev) IMPROVEMENTS: + ZOOKEEPER-279. Allow specialization of quorum config parsing + (e.g. variable expansion in zoo.cfg) (Jean-Daniel Cryans via phunt) + 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/quorum/QuorumPeerConfig.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=750597&r1=750596&r2=750597&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (original) +++ hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java Thu Mar 5 21:32:15 2009 @@ -23,14 +23,12 @@ import java.io.FileInputStream; import java.io.FileReader; import java.net.InetSocketAddress; +import java.util.HashMap; import java.util.Properties; import java.util.Map.Entry; -import java.util.HashMap; import org.apache.log4j.Logger; - import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; public class QuorumPeerConfig extends ServerConfig { @@ -44,7 +42,9 @@ private HashMap servers = null; private long serverId; - private QuorumPeerConfig(int port, String dataDir, String dataLogDir, int tickTime) { + protected QuorumPeerConfig(int port, String dataDir, String dataLogDir, + int tickTime) + { super(port, dataDir, dataLogDir, tickTime); } @@ -66,6 +66,11 @@ } finally { zooCfgStream.close(); } + + parseProperties(cfg); + } + + protected static void parseProperties(Properties zkProp) throws Exception { HashMap servers = new HashMap(); String dataDir = null; String dataLogDir = null; @@ -75,7 +80,7 @@ int syncLimit = 0; int electionAlg = 3; int electionPort = 2182; - for (Entry entry : cfg.entrySet()) { + for (Entry entry : zkProp.entrySet()) { String key = entry.getKey().toString(); String value = entry.getValue().toString(); if (key.equals("dataDir")) {