You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/06/07 10:48:56 UTC

svn commit: r1490544 - in /zookeeper/bookkeeper/branches/branch-4.2: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java

Author: ivank
Date: Fri Jun  7 08:48:55 2013
New Revision: 1490544

URL: http://svn.apache.org/r1490544
Log:
BOOKKEEPER-559: Fix occasional failure in AuditorBookieTest (ivank)

Modified:
    zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
    zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java

Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1490544&r1=1490543&r2=1490544&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Jun  7 08:48:55 2013
@@ -6,9 +6,11 @@ Release 4.2.2 - Unreleased
 
       bookkeeper-server:
 
-       BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank)
+        BOOKKEEPER-559: Fix occasional failure in AuditorBookieTest (ivank)
 
-       BOOKKEEPER-583: Read from a ReadOnlyBookie fails if index fileinfo is not in ledger cache (vinay via sijie)
+        BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank)
+
+        BOOKKEEPER-583: Read from a ReadOnlyBookie fails if index fileinfo is not in ledger cache (vinay via sijie)
 
 Release 4.2.1 - 2013-02-19
 

Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java?rev=1490544&r1=1490543&r2=1490544&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java Fri Jun  7 08:48:55 2013
@@ -212,6 +212,9 @@ public class AuditorElector {
 
         Runnable r = new Runnable() {
                 public void run() {
+                    if (!running.get()) {
+                        return;
+                    }
                     try {
                         // creating my vote in zk. Vote format is 'V_numeric'
                         createMyVote();