zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject svn commit: r1565112 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
Date Thu, 06 Feb 2014 08:31:12 GMT
Author: sijie
Date: Thu Feb  6 08:31:11 2014
New Revision: 1565112

URL: http://svn.apache.org/r1565112
Log:
BOOKKEEPER-725: AutoRecoveryMain should exit with error code if deathwatcher finds dead thread
(ivank 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=1565112&r1=1565111&r2=1565112&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Thu Feb  6 08:31:11 2014
@@ -160,6 +160,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-729: Bookie shouldn't exit with 0, if exiting from deathwatcher and thread
death was caused by OOM (ivank via fpj)
 
+        BOOKKEEPER-725: AutoRecoveryMain should exit with error code if deathwatcher finds
dead thread (ivank 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=1565112&r1=1565111&r2=1565112&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
Thu Feb  6 08:31:11 2014
@@ -170,7 +170,7 @@ public class AutoRecoveryMain {
                 // If any one service not running, then shutdown peer.
                 if (!autoRecoveryMain.auditorElector.isRunning()
                     || !autoRecoveryMain.replicationWorker.isRunning()) {
-                    autoRecoveryMain.shutdown();
+                    autoRecoveryMain.shutdown(ExitCode.SERVER_EXCEPTION);
                     break;
                 }
             }



Mime
View raw message