Updated Branches: refs/heads/cassandra-2.0 4a6f8a661 -> d9dac014e
Don't drop local mutations without a trace patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-6510 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38642c5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38642c5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38642c5b Branch: refs/heads/cassandra-2.0 Commit: 38642c5b2c5e410da29f54b0918d7358c1592402 Parents: b73178d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Dec 19 16:48:10 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Dec 19 16:48:10 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 +++---- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38642c5b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a1514d0..3488cde 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 1.2.14 * Allow executing CREATE statements multiple times (CASSANDRA-6471) * Don't send confusing info with timeouts (CASSANDRA-6491) + * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) + * Don't drop local mutations without a trace (CASSANDRA-6510) 1.2.13 * Improved error message on bad properties in DDL queries (CASSANDRA-6453) http://git-wip-us.apache.org/repos/asf/cassandra/blob/38642c5b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 2d29dde..7843fc1 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -862,6 +862,7 @@ public class DatabaseDescriptor return getTruncateRpcTimeout(); case READ_REPAIR: case MUTATION: + case COUNTER_MUTATION: return getWriteRpcTimeout(); default: return getRpcTimeout(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/38642c5b/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index e6cd755..dbe029b 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -646,15 +646,14 @@ public class StorageProxy implements StorageProxyMBean private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler) { - Runnable runnable = new DroppableRunnable(MessagingService.Verb.MUTATION) + StageManager.getStage(Stage.MUTATION).execute(new LocalMutationRunnable() { public void runMayThrow() throws IOException { rm.apply(); responseHandler.response(null); } - }; - StageManager.getStage(Stage.MUTATION).execute(runnable); + }); } /** @@ -758,7 +757,7 @@ public class StorageProxy implements StorageProxyMBean final String localDataCenter, final ConsistencyLevel consistency_level) { - return new LocalMutationRunnable() + return new DroppableRunnable(MessagingService.Verb.COUNTER_MUTATION) { public void runMayThrow() throws IOException {
