cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/3] git commit: Retry important messages for any IOException
Date Fri, 26 Jul 2013 15:51:46 GMT
Updated Branches:
  refs/heads/cassandra-1.2 1810af404 -> dfa59e372
  refs/heads/trunk 791522597 -> f921965a0


Retry important messages for any IOException

patch by Ashley Winters; reveiewed by yukim for CASSANDRA-5804


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfa59e37
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfa59e37
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfa59e37

Branch: refs/heads/cassandra-1.2
Commit: dfa59e372ef00545ff1c8e1aed8da1c002fd6db8
Parents: 1810af4
Author: Ashley Winters <ashley.winters@freedomvoice.com>
Authored: Fri Jul 26 10:50:28 2013 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Jul 26 10:50:28 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfa59e37/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 858bbf8..077a986 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 1.2.8
  * cqlsh: add collections support to COPY (CASSANDRA-5698)
+ * retry important messages for any IOException (CASSANDRA-5804)
 
 
 1.2.7

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfa59e37/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 648123b..4edac5d 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -215,7 +215,7 @@ public class OutboundTcpConnection extends Thread
 
                 // if the message was important, such as a repair acknowledgement, put it
back on the queue
                 // to retry after re-connecting.  See CASSANDRA-5393
-                if (e instanceof SocketException && qm.shouldRetry())
+                if (qm.shouldRetry())
                 {
                     try
                     {


Mime
View raw message