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/07/03 17:39:02 UTC
svn commit: r1499445 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
Author: ivank
Date: Wed Jul 3 15:39:01 2013
New Revision: 1499445
URL: http://svn.apache.org/r1499445
Log:
BOOKKEEPER-641: DeathWatcher thread is unnecessarily running even after bookie shutdown (rakeshr via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1499445&r1=1499444&r2=1499445&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Jul 3 15:39:01 2013
@@ -38,6 +38,8 @@ Trunk (unreleased changes)
BOOKKEEPER-637: NoSuchEntry exception when reading an entry from a bookie should not print ERROR level message (mmerli via ivank)
+ BOOKKEEPER-641: DeathWatcher thread is unnecessarily running even after bookie shutdown (rakeshr via ivank)
+
bookkeeper-server:
BOOKKEEPER-567: ReadOnlyBookieTest hangs on shutdown (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java?rev=1499445&r1=1499444&r2=1499445&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java Wed Jul 3 15:39:01 2013
@@ -199,9 +199,9 @@ public class BookieServer {
/**
* A thread to watch whether bookie & nioserver is still alive
*/
- class DeathWatcher extends Thread {
+ private class DeathWatcher extends Thread {
- final int watchInterval;
+ private final int watchInterval;
DeathWatcher(ServerConfiguration conf) {
super("BookieDeathWatcher-" + conf.getBookiePort());
@@ -218,12 +218,14 @@ public class BookieServer {
}
if (!isBookieRunning()) {
shutdown();
+ break;
}
if (isAutoRecoveryDaemonEnabled && !isAutoRecoveryRunning()) {
LOG.error("Autorecovery daemon has stopped. Please check the logs");
isAutoRecoveryDaemonEnabled = false; // to avoid spamming the logs
}
}
+ LOG.info("BookieDeathWatcher exited loop!");
}
}