cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [2/3] git commit: Follow up on CASSANDRA-7189
Date Mon, 12 May 2014 22:02:08 GMT
Follow up on CASSANDRA-7189

fix hang when no CF name is given


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

Branch: refs/heads/trunk
Commit: 3fab711ee76c081c0ab5874d64b78673334f9071
Parents: 359de19
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon May 12 16:47:23 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon May 12 16:47:23 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fab711e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 68257bb..59df759 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2700,9 +2700,14 @@ public class StorageService extends NotificationBroadcasterSupport
implements IE
                 }
 
                 List<RepairFuture> futures = new ArrayList<>(ranges.size());
+                String[] cfnames = new String[columnFamilyStores.size()];
+                for (int i = 0; i < columnFamilyStores.size(); i++)
+                {
+                    cfnames[i] = columnFamilyStores.get(i).name;
+                }
                 for (Range<Token> range : ranges)
                 {
-                    RepairFuture future = ActiveRepairService.instance.submitRepairSession(parentSession,
range, keyspace, isSequential, rangeToNeighbors.get(range), columnFamilies);
+                    RepairFuture future = ActiveRepairService.instance.submitRepairSession(parentSession,
range, keyspace, isSequential, rangeToNeighbors.get(range), cfnames);
                     if (future == null)
                         continue;
                     futures.add(future);


Mime
View raw message