You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/06/01 23:00:54 UTC
svn commit: r1746512 - in /zookeeper/branches/branch-3.5: ./
src/java/main/org/apache/zookeeper/server/quorum/
src/java/test/org/apache/zookeeper/test/
Author: phunt
Date: Wed Jun 1 23:00:54 2016
New Revision: 1746512
URL: http://svn.apache.org/viewvc?rev=1746512&view=rev
Log:
ZOOKEEPER-2410: add time unit to 'ELECTION TOOK' log.info message (Christine Poerschke via phunt)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/FLETest.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1746512&r1=1746511&r2=1746512&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Wed Jun 1 23:00:54 2016
@@ -187,6 +187,9 @@ IMPROVEMENTS:
ZOOKEEPER-2402: Document client side properties (Arshad Mohammad via fpj)
+ ZOOKEEPER-2410: add time unit to 'ELECTION TOOK' log.info message
+ (Christine Poerschke via phunt)
+
Release 3.5.1 - 07/27/2015
NEW FEATURES:
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java?rev=1746512&r1=1746511&r2=1746512&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Follower.java Wed Jun 1 23:00:54 2016
@@ -64,7 +64,7 @@ public class Follower extends Learner{
void followLeader() throws InterruptedException {
self.end_fle = Time.currentElapsedTime();
LOG.info("FOLLOWING - LEADER ELECTION TOOK - " +
- (self.end_fle - self.start_fle));
+ (self.end_fle - self.start_fle) + " " + QuorumPeer.FLE_TIME_UNIT);
self.start_fle = 0;
self.end_fle = 0;
fzk.registerJMX(new FollowerBean(this, zk), self.jmxLocalPeerBean);
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1746512&r1=1746511&r2=1746512&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Wed Jun 1 23:00:54 2016
@@ -410,7 +410,7 @@ public class Leader {
void lead() throws IOException, InterruptedException {
self.end_fle = Time.currentElapsedTime();
LOG.info("LEADING - LEADER ELECTION TOOK - " +
- (self.end_fle - self.start_fle));
+ (self.end_fle - self.start_fle) + " " + QuorumPeer.FLE_TIME_UNIT);
self.start_fle = 0;
self.end_fle = 0;
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1746512&r1=1746511&r2=1746512&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Wed Jun 1 23:00:54 2016
@@ -395,7 +395,8 @@ public class QuorumPeer extends ZooKeepe
/*
* Record leader election time
*/
- public long start_fle, end_fle;
+ public long start_fle, end_fle; // fle = fast leader election
+ public static final String FLE_TIME_UNIT = "MS";
/*
* Default value of peer is participant
Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/FLETest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/FLETest.java?rev=1746512&r1=1746511&r2=1746512&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/FLETest.java (original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/FLETest.java Wed Jun 1 23:00:54 2016
@@ -528,4 +528,9 @@ public class FLETest extends ZKTestCase
}
}
}
+
+ @Test
+ public void testElectionTimeUnit() throws Exception {
+ Assert.assertEquals("MS", QuorumPeer.FLE_TIME_UNIT);
+ }
}