You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/11 18:41:28 UTC
[2/3] git commit: Fix trying to hint timed out counter writes patch
by jbellis; reviewed by aleksey for CASSANDRA-6322
Fix trying to hint timed out counter writes
patch by jbellis; reviewed by aleksey for CASSANDRA-6322
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3af19c4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3af19c4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3af19c4d
Branch: refs/heads/trunk
Commit: 3af19c4dd17000635e8f6116ff8c0f67db81ae77
Parents: 5522a18
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:39:21 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:40:45 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/WriteCallbackInfo.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3af19c4d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f28e88..fa0b7cff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.3
+ * Fix trying to hint timed out counter writes (CASSANDRA-6322)
* Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
* Avoid flushing compaction_history after each operation (CASSANDRA-6287)
* Fix repair assertion error when tombstones expire (CASSANDRA-6277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3af19c4d/src/java/org/apache/cassandra/net/WriteCallbackInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/WriteCallbackInfo.java b/src/java/org/apache/cassandra/net/WriteCallbackInfo.java
index 38e4b5a..be7b668 100644
--- a/src/java/org/apache/cassandra/net/WriteCallbackInfo.java
+++ b/src/java/org/apache/cassandra/net/WriteCallbackInfo.java
@@ -39,6 +39,8 @@ public class WriteCallbackInfo extends CallbackInfo
public boolean shouldHint()
{
- return consistencyLevel != ConsistencyLevel.ANY && StorageProxy.shouldHint(target);
+ return sentMessage.verb != MessagingService.Verb.COUNTER_MUTATION
+ && consistencyLevel != ConsistencyLevel.ANY
+ && StorageProxy.shouldHint(target);
}
}