You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/12/11 15:21:06 UTC
[1/3] cassandra git commit: Fix error message on read repair timeouts
Repository: cassandra
Updated Branches:
refs/heads/trunk 6ce8b3fcb -> 857de5540
Fix error message on read repair timeouts
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7947
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/451c514a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/451c514a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/451c514a
Branch: refs/heads/trunk
Commit: 451c514a3a02f4e889f040176453beefbcd75843
Parents: 5784309
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu Dec 11 15:17:29 2014 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 11 15:17:29 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageProxy.java | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/451c514a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 385af01..cd302fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix error message on read repair timeouts (CASSANDRA-7947)
* Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
* Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
* Throw correct exception when trying to bind a keyspace or table
http://git-wip-us.apache.org/repos/asf/cassandra/blob/451c514a/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 f877aee..1e1a2a3 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1368,6 +1368,17 @@ public class StorageProxy implements StorageProxyMBean
{
throw new AssertionError(e); // full data requested from each node here, no digests should be sent
}
+ catch (ReadTimeoutException e)
+ {
+ if (Tracing.isTracing())
+ Tracing.trace("Timed out waiting on digest mismatch repair requests");
+ else
+ logger.debug("Timed out waiting on digest mismatch repair requests");
+ // the caught exception here will have CL.ALL from the repair command,
+ // not whatever CL the initial command was at (CASSANDRA-7947)
+ int blockFor = consistencyLevel.blockFor(Keyspace.open(command.getKeyspace()));
+ throw new ReadTimeoutException(consistencyLevel, blockFor-1, blockFor, true);
+ }
RowDataResolver resolver = (RowDataResolver)handler.resolver;
try
@@ -1378,7 +1389,10 @@ public class StorageProxy implements StorageProxyMBean
}
catch (TimeoutException e)
{
- Tracing.trace("Timed out on digest mismatch retries");
+ if (Tracing.isTracing())
+ Tracing.trace("Timed out waiting on digest mismatch repair acknowledgements");
+ else
+ logger.debug("Timed out waiting on digest mismatch repair acknowledgements");
int blockFor = consistencyLevel.blockFor(Keyspace.open(command.getKeyspace()));
throw new ReadTimeoutException(consistencyLevel, blockFor-1, blockFor, true);
}
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/745ddd1c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/745ddd1c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/745ddd1c
Branch: refs/heads/trunk
Commit: 745ddd1c2c2156a43097934941b7d160cc6a981c
Parents: 27c67ad 451c514
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 11 15:20:26 2014 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 11 15:20:26 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageProxy.java | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/745ddd1c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 25e0f47,cd302fb..71a6642
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.0.12:
+2.1.3
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Fix error message on read repair timeouts (CASSANDRA-7947)
* Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
* Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
* Throw correct exception when trying to bind a keyspace or table
http://git-wip-us.apache.org/repos/asf/cassandra/blob/745ddd1c/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857de554
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857de554
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/857de554
Branch: refs/heads/trunk
Commit: 857de554066ecbe507ebab13b9cfe6a2749c403f
Parents: 6ce8b3f 745ddd1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 11 15:20:56 2014 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 11 15:20:56 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageProxy.java | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/857de554/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/857de554/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------