cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/3] cassandra git commit: Use higher timeout for prepair and snapshot in repair
Date Fri, 01 May 2015 19:49:26 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f43efaa1b -> 9b6f55bde
  refs/heads/trunk 6404e015f -> d305ce42f


Use higher timeout for prepair and snapshot in repair

patch by sankalp kohli; reviewed by yukim for CASSANDRA-9261


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

Branch: refs/heads/cassandra-2.1
Commit: 9b6f55bdec6d9b7c08d7cae267b2fefbf60d7afc
Parents: f43efaa
Author: sankalp kohli <kohlisankalp@gmail.com>
Authored: Fri May 1 14:46:57 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri May 1 14:48:24 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/repair/SnapshotTask.java         | 5 +++--
 src/java/org/apache/cassandra/service/ActiveRepairService.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6f55bd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b0e4fc6..627cc6b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix deleting from an empty list (CASSANDRA-9198)
  * Update tuple and collection types that use a user-defined type when that UDT
    is modified (CASSANDRA-9148, CASSANDRA-9192)
+ * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 Merged from 2.0:
  * Fix index selection during rebuild with certain table layouts (CASSANDRA-9281)
  * Fix partition-level-delete-only workload accounting (CASSANDRA-9194)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6f55bd/src/java/org/apache/cassandra/repair/SnapshotTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/SnapshotTask.java b/src/java/org/apache/cassandra/repair/SnapshotTask.java
index 6c3afb1..53e048d 100644
--- a/src/java/org/apache/cassandra/repair/SnapshotTask.java
+++ b/src/java/org/apache/cassandra/repair/SnapshotTask.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.repair;
 
 import java.net.InetAddress;
 import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
@@ -43,9 +44,9 @@ public class SnapshotTask extends AbstractFuture<InetAddress> implements
Runnabl
 
     public void run()
     {
-        MessagingService.instance().sendRRWithFailure(new SnapshotMessage(desc).createMessage(),
+        MessagingService.instance().sendRR(new SnapshotMessage(desc).createMessage(),
                 endpoint,
-                new SnapshotCallback(this));
+                new SnapshotCallback(this), TimeUnit.HOURS.toMillis(1), true);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6f55bd/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index f71cb6b..ac5ed99 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -282,7 +282,7 @@ public class ActiveRepairService
         {
             PrepareMessage message = new PrepareMessage(parentRepairSession, cfIds, ranges);
             MessageOut<RepairMessage> msg = message.createMessage();
-            MessagingService.instance().sendRRWithFailure(msg, neighbour, callback);
+            MessagingService.instance().sendRR(msg, neighbour, callback, TimeUnit.HOURS.toMillis(1),
true);
         }
         try
         {


Mime
View raw message