zookeeper-commits mailing list archives

Author: sijie
Date: Mon Mar 10 02:14:35 2014
New Revision: 1575795

URL: http://svn.apache.org/r1575795
Log:
BOOKKEEPER-740: AutoRecoveryMainTest#testAutoRecoverySessionLoss is failing (Rakesh via sijie)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1575795&r1=1575794&r2=1575795&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Mar 10 02:14:35 2014
@@ -174,6 +174,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-730: Shade pom file missing apache license header (ivank)
 
+        BOOKKEEPER-740: AutoRecoveryMainTest#testAutoRecoverySessionLoss is failing (Rakesh
via sijie)
+
       hedwig-server:
 
         BOOKKEEPER-601: readahead cache size isn't updated correctly (sijie via fpj)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java?rev=1575795&r1=1575794&r2=1575795&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
Mon Mar 10 02:14:35 2014
@@ -120,13 +120,17 @@ public class AutoRecoveryMain {
         try {
             deathWatcher.interrupt();
             deathWatcher.join();
-
-            auditorElector.shutdown();
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             LOG.warn("Interrupted shutting down auto recovery", e);
         }
 
+        try {
+            auditorElector.shutdown();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            LOG.warn("Interrupted shutting down auditor elector", e);
+        }
         replicationWorker.shutdown();
         try {
             zk.close();