svn commit: r957998 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java src/java/org/apache/cassandra/thrift/CassandraDaemon.java

[jbellis]

Author: jbellis
Date: Fri Jun 25 14:52:52 2010
New Revision: 957998

URL: http://svn.apache.org/viewvc?rev=957998&view=rev
Log:
make DTPE handle exceptions the same way as CassandraDaemon.  patch by jbellis; 
reviewed by eevans for CASSANDRA-1226

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=957998&r1=957997&r2=957998&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri Jun 25 14:52:52 2010
@@ -28,6 +28,7 @@
  * added a redhat init script to contrib (CASSANDRA-1201)
  * use midpoint when bootstrapping a new machine into range with not
    much data yet instead of random token (CASSANDRA-1112)
+ * kill server on OOM in executor stage as well as Thrift (CASSANDRA-1226)
 
 
 0.6.2

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java?rev=957998&r1=957997&r2=957998&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
 Fri Jun 25 14:52:52 2010
@@ -91,7 +91,7 @@ public class DebuggableThreadPoolExecuto
             }
             catch (ExecutionException e)
             {
-                logger.error("Error in executor futuretask", e);
+                
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(),
 e);
             }
         }
 

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?rev=957998&r1=957997&r2=957998&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
 Fri Jun 25 14:52:52 2010
@@ -80,7 +80,7 @@ public class CassandraDaemon
         {
             public void uncaughtException(Thread t, Throwable e)
             {
-                logger.error("Fatal exception in thread " + t, e);
+                logger.error("Uncaught exception in thread " + t, e);
                 if (e instanceof OutOfMemoryError)
                 {
                     System.exit(100);