You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/17 17:09:31 UTC
[1/6] git commit: HSHA rethrows OOM Patch by Mikhail Stepura,
reviewed by brandonwilliams for CASSANDRA-6255
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 <br...@apache.org>
Authored: Fri Jan 17 10:06:21 2014 -0600
Committer: Brandon Williams <br...@apache.org>
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
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf142892
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf142892
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf142892
Branch: refs/heads/trunk
Commit: bf1428922937033e16f792d453b7987d64bf3f73
Parents: c8a0a3a 14c6f70
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 10:07:34 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 17 10:07:34 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14c6f703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14c6f703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14c6f703
Branch: refs/heads/cassandra-2.0
Commit: 14c6f70301d30f81369b614b6e43e8da2ddf2f80
Parents: 90f661e a3f7035
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 10:07:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 17 10:07:24 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: HSHA rethrows OOM Patch by Mikhail Stepura,
reviewed by brandonwilliams for CASSANDRA-6255
Posted by br...@apache.org.
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/trunk
Commit: a3f703561d3f08e76c770628a51724525657a93f
Parents: 18789da
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 10:06:21 2014 -0600
Committer: Brandon Williams <br...@apache.org>
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
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14c6f703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14c6f703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14c6f703
Branch: refs/heads/trunk
Commit: 14c6f70301d30f81369b614b6e43e8da2ddf2f80
Parents: 90f661e a3f7035
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 10:07:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 17 10:07:24 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: HSHA rethrows OOM Patch by Mikhail Stepura,
reviewed by brandonwilliams for CASSANDRA-6255
Posted by br...@apache.org.
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-2.0
Commit: a3f703561d3f08e76c770628a51724525657a93f
Parents: 18789da
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 10:06:21 2014 -0600
Committer: Brandon Williams <br...@apache.org>
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