Updated Branches: refs/heads/cassandra-1.2 18789da7c -> a3f703561 refs/heads/cassandra-2.0 90f661eee -> 14c6f7030 refs/heads/trunk c8a0a3a68 -> bf1428922
HSHA rethrows OOM Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6255 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3f70356 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3f70356 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3f70356 Branch: refs/heads/cassandra-1.2 Commit: a3f703561d3f08e76c770628a51724525657a93f Parents: 18789da Author: Brandon Williams <[email protected]> Authored: Fri Jan 17 10:06:21 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 17 10:06:21 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3f70356/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java index 7b9a563..2e2287d 100644 --- a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java +++ b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java @@ -30,13 +30,15 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.utils.FBUtilities; +import com.google.common.base.Throwables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.metrics.StorageMetrics; +import org.apache.cassandra.utils.FBUtilities; import org.apache.thrift.server.TNonblockingServer; import org.apache.thrift.server.TServer; import org.apache.thrift.transport.TNonblockingServerTransport; @@ -184,6 +186,9 @@ public class CustomTHsHaServer extends TNonblockingServer } catch (Throwable t) { + if (t instanceof OutOfMemoryError) + Throwables.propagate(t); + StorageMetrics.exceptions.inc(); LOGGER.error("Uncaught Exception: ", t); } finally
