[1/2] git commit: Shutdown JVM on OOM

2014-10-09 Thread jmckenzie 
Repository: cassandra
Updated Branches:
  refs/heads/trunk a9bad890f - 50734f207


Shutdown JVM on OOM

patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7507


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14521347
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14521347
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14521347

Branch: refs/heads/trunk
Commit: 1452134707e2a143def3c03d1db416b1c8197565
Parents: 5a33a9a
Author: Joshua McKenzie josh.mcken...@datastax.com
Authored: Thu Oct 9 10:40:57 2014 -0500
Committer: Joshua McKenzie josh.mcken...@datastax.com
Committed: Thu Oct 9 10:40:57 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraAuthorizer.java |  6 +--
 .../AbstractTracingAwareExecutorService.java|  2 +
 .../DebuggableScheduledThreadPoolExecutor.java  |  7 ++-
 .../apache/cassandra/concurrent/SEPWorker.java  |  3 ++
 .../db/commitlog/CommitLogReplayer.java |  1 +
 .../db/commitlog/CommitLogSegmentManager.java   |  2 +
 .../db/compaction/CompactionManager.java|  7 +--
 .../cassandra/db/compaction/Scrubber.java   |  2 +
 src/java/org/apache/cassandra/gms/Gossiper.java |  2 +
 .../io/sstable/SSTableSimpleUnsortedWriter.java |  2 +
 .../org/apache/cassandra/io/util/FileUtils.java |  5 ++-
 .../cassandra/service/CassandraDaemon.java  | 20 ++---
 .../cassandra/service/StorageService.java   | 18 ++--
 .../cassandra/streaming/ConnectionHandler.java  |  6 ++-
 .../streaming/messages/IncomingFileMessage.java |  6 ++-
 .../org/apache/cassandra/tools/NodeProbe.java   |  6 ++-
 .../cassandra/tools/SSTableLevelResetter.java   |  6 ++-
 .../org/apache/cassandra/transport/Message.java |  6 ++-
 .../org/apache/cassandra/utils/CLibrary.java|  1 +
 .../cassandra/utils/FastByteOperations.java |  4 +-
 .../cassandra/utils/JVMStabilityInspector.java  | 45 
 .../apache/cassandra/utils/ResourceWatcher.java |  1 +
 23 files changed, 117 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 054870b..8d64d34 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Shutdown JVM on OOM (CASSANDRA-7507)
  * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
  * Don't duplicate sstables smaller than split size when using
the sstablesplitter tool (CASSANDRA-7616)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java 
b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 9b22e22..20060c0 100644
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@ -185,7 +185,7 @@ public class CassandraAuthorizer implements IAuthorizer
 {
 process(String.format(DELETE FROM %s.%s WHERE username = '%s', 
Auth.AUTH_KS, PERMISSIONS_CF, escape(droppedUser)));
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all permissions 
of {}: {}, droppedUser, e);
 }
@@ -204,7 +204,7 @@ public class CassandraAuthorizer implements IAuthorizer
  PERMISSIONS_CF,
  escape(droppedResource.getName(;
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all permissions 
on {}: {}, droppedResource, e);
 return;
@@ -220,7 +220,7 @@ public class CassandraAuthorizer implements IAuthorizer
   escape(row.getString(USERNAME)),
   escape(droppedResource.getName(;
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all 
permissions on {}: {}, droppedResource, e);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
 
b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java

git commit: Shutdown JVM on OOM

2014-10-09 Thread jmckenzie 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 5a33a9ad2 - 145213470


Shutdown JVM on OOM

patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7507


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14521347
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14521347
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14521347

Branch: refs/heads/cassandra-2.1
Commit: 1452134707e2a143def3c03d1db416b1c8197565
Parents: 5a33a9a
Author: Joshua McKenzie josh.mcken...@datastax.com
Authored: Thu Oct 9 10:40:57 2014 -0500
Committer: Joshua McKenzie josh.mcken...@datastax.com
Committed: Thu Oct 9 10:40:57 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraAuthorizer.java |  6 +--
 .../AbstractTracingAwareExecutorService.java|  2 +
 .../DebuggableScheduledThreadPoolExecutor.java  |  7 ++-
 .../apache/cassandra/concurrent/SEPWorker.java  |  3 ++
 .../db/commitlog/CommitLogReplayer.java |  1 +
 .../db/commitlog/CommitLogSegmentManager.java   |  2 +
 .../db/compaction/CompactionManager.java|  7 +--
 .../cassandra/db/compaction/Scrubber.java   |  2 +
 src/java/org/apache/cassandra/gms/Gossiper.java |  2 +
 .../io/sstable/SSTableSimpleUnsortedWriter.java |  2 +
 .../org/apache/cassandra/io/util/FileUtils.java |  5 ++-
 .../cassandra/service/CassandraDaemon.java  | 20 ++---
 .../cassandra/service/StorageService.java   | 18 ++--
 .../cassandra/streaming/ConnectionHandler.java  |  6 ++-
 .../streaming/messages/IncomingFileMessage.java |  6 ++-
 .../org/apache/cassandra/tools/NodeProbe.java   |  6 ++-
 .../cassandra/tools/SSTableLevelResetter.java   |  6 ++-
 .../org/apache/cassandra/transport/Message.java |  6 ++-
 .../org/apache/cassandra/utils/CLibrary.java|  1 +
 .../cassandra/utils/FastByteOperations.java |  4 +-
 .../cassandra/utils/JVMStabilityInspector.java  | 45 
 .../apache/cassandra/utils/ResourceWatcher.java |  1 +
 23 files changed, 117 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 054870b..8d64d34 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Shutdown JVM on OOM (CASSANDRA-7507)
  * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
  * Don't duplicate sstables smaller than split size when using
the sstablesplitter tool (CASSANDRA-7616)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
--
diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java 
b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 9b22e22..20060c0 100644
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@ -185,7 +185,7 @@ public class CassandraAuthorizer implements IAuthorizer
 {
 process(String.format(DELETE FROM %s.%s WHERE username = '%s', 
Auth.AUTH_KS, PERMISSIONS_CF, escape(droppedUser)));
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all permissions 
of {}: {}, droppedUser, e);
 }
@@ -204,7 +204,7 @@ public class CassandraAuthorizer implements IAuthorizer
  PERMISSIONS_CF,
  escape(droppedResource.getName(;
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all permissions 
on {}: {}, droppedResource, e);
 return;
@@ -220,7 +220,7 @@ public class CassandraAuthorizer implements IAuthorizer
   escape(row.getString(USERNAME)),
   escape(droppedResource.getName(;
 }
-catch (Throwable e)
+catch (RequestExecutionException e)
 {
 logger.warn(CassandraAuthorizer failed to revoke all 
permissions on {}: {}, droppedResource, e);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/14521347/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java