zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1490605 - in /zookeeper/bookkeeper/branches/branch-4.2: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
Date Fri, 07 Jun 2013 12:13:38 GMT
Author: ivank
Date: Fri Jun  7 12:13:38 2013
New Revision: 1490605

URL: http://svn.apache.org/r1490605
Log:
BOOKKEEPER-595: Crash of inprocess autorecovery daemon should not take down the bookie (ivank)

Modified:
    zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
    zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.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=1490605&r1=1490604&r2=1490605&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Jun  7 12:13:38 2013
@@ -16,6 +16,8 @@ Release 4.2.2 - Unreleased
 
         BOOKKEEPER-581: Ledger recovery doesn't work correctly when recovery adds force changing
ensembles. (sijie via ivank)
 
+        BOOKKEEPER-595: Crash of inprocess autorecovery daemon should not take down the bookie
(ivank)
+
       hedwig-server:
 
         BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)

Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java?rev=1490605&r1=1490604&r2=1490605&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
(original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
Fri Jun  7 12:13:38 2013
@@ -76,7 +76,7 @@ public class BookieServer implements NIO
     final BKStats bkStats = BKStats.getInstance();
     final boolean isStatsEnabled;
     protected BookieServerBean jmxBkServerBean;
-    private AutoRecoveryMain autoRecoveryMain = null;
+    AutoRecoveryMain autoRecoveryMain = null;
     private boolean isAutoRecoveryDaemonEnabled;
 
     public BookieServer(ServerConfiguration conf) throws IOException,
@@ -242,11 +242,14 @@ public class BookieServer implements NIO
                     // do nothing
                 }
                 if (!isBookieRunning()
-                        || !isNioServerRunning()
-                        || (isAutoRecoveryDaemonEnabled && !isAutoRecoveryRunning()))
{
+                    || !isNioServerRunning()) {
                     shutdown();
                     break;
                 }
+                if (isAutoRecoveryDaemonEnabled && !isAutoRecoveryRunning()) {
+                    LOG.error("Autorecovery daemon has stopped. Please check the logs");
+                    isAutoRecoveryDaemonEnabled = false; // to avoid spamming the logs
+                }
             }
         }
     }



Mime
View raw message