Author: mahadev Date: Wed Mar 18 16:36:19 2009 New Revision: 755632 URL: http://svn.apache.org/viewvc?rev=755632&view=rev Log: ZOOKEEPER-341. regression in QuorumPeerMain, tickTime from config is lost, cannot start quorum (phunt via mahadev)
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=755632&r1=755631&r2=755632&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.1/CHANGES.txt Wed Mar 18 16:36:19 2009 @@ -23,6 +23,9 @@ ZOOKEEPER-309. core dump using zoo_get_acl() (mahadev via phunt) + ZOOKEEPER-341. regression in QuorumPeerMain, tickTime + from config is lost, cannot start quorum (phunt via mahadev) + IMPROVEMENTS: ZOOKEEPER-279. Allow specialization of quorum config parsing 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=755632&r1=755631&r2=755632&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 Wed Mar 18 16:36:19 2009 @@ -34,7 +34,6 @@ public class QuorumPeerConfig extends ServerConfig { private static final Logger LOG = Logger.getLogger(QuorumPeerConfig.class); - private int tickTime; private int initLimit; private int syncLimit; private int electionAlg; @@ -189,11 +188,6 @@ return QuorumPeerConfig.getServers().size() <= 1; } - public static int getTickTime() { - assert instance instanceof QuorumPeerConfig; - return ((QuorumPeerConfig)instance).tickTime; - } - public static int getInitLimit() { assert instance instanceof QuorumPeerConfig; return ((QuorumPeerConfig)instance).initLimit;