Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 0471f4064 -> fbe7b909b
Fix MS expiring map timeout for CAS messages patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7752 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7e88033 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7e88033 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7e88033 Branch: refs/heads/cassandra-2.1.0 Commit: f7e88033452ae2fee18a4fc4ec104d14bbddefbe Parents: 6caf426 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 12 18:16:54 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 12 18:18:18 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e88033/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fc32426..d42c100 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226) * Better error message when adding a collection with the same name http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e88033/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 7987193..3162fd1 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -829,6 +829,9 @@ public class DatabaseDescriptor return getTruncateRpcTimeout(); case READ_REPAIR: case MUTATION: + case PAXOS_COMMIT: + case PAXOS_PREPARE: + case PAXOS_PROPOSE: case COUNTER_MUTATION: return getWriteRpcTimeout(); default:
