zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1506513 - in /zookeeper/bookkeeper/branches/branch-4.2: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
Date Wed, 24 Jul 2013 12:16:11 GMT
Author: ivank
Date: Wed Jul 24 12:16:10 2013
New Revision: 1506513

URL: http://svn.apache.org/r1506513
Log:
BOOKKEEPER-625: On OutOfMemoryError in NIOServerFactory thread bookie should shutdown (vinay
via 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/NIOServerFactory.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=1506513&r1=1506512&r2=1506513&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Wed Jul 24 12:16:10 2013
@@ -48,6 +48,8 @@ Release 4.2.2 - Unreleased
 
         BOOKKEEPER-652: Logger class name is wrong in LedgerCacheImpl.java (Rakesh via sijie)
 
+        BOOKKEEPER-625: On OutOfMemoryError in NIOServerFactory thread bookie should shutdown
(vinay via 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/NIOServerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java?rev=1506513&r1=1506512&r2=1506513&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
(original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
Wed Jul 24 12:16:10 2013
@@ -108,7 +108,7 @@ public class NIOServerFactory extends Th
     }
 
     public boolean isRunning() {
-        return !ss.socket().isClosed();
+        return !ss.socket().isClosed() && isAlive();
     }
 
     /**
@@ -164,6 +164,9 @@ public class NIOServerFactory extends Th
                 selected.clear();
             } catch (Exception e) {
                 LOG.warn("Exception in server socket loop: " + ss.socket().getInetAddress(),
e);
+            } catch (Throwable e) {
+                LOG.error("Error in server socket loop: " + ss.socket().getInetAddress(),
e);
+                break;
             }
         }
         LOG.info("NIOServerCnxn factory exitedloop.");



Mime
View raw message