You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/05/13 00:02:07 UTC
[1/3] git commit: Follow up on CASSANDRA-7189
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 359de196f -> 3fab711ee
refs/heads/trunk 74c49b65e -> 8d3c08b59
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/cassandra-2.1
Commit: 3fab711ee76c081c0ab5874d64b78673334f9071
Parents: 359de19
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon May 12 16:47:23 2014 -0500
Committer: Yuki Morishita <yu...@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);
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@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/8d3c08b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3c08b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3c08b5
Branch: refs/heads/trunk
Commit: 8d3c08b599fe703d35dc4899a8fe4effd5b6dd4f
Parents: 74c49b6 3fab711
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon May 12 17:01:48 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon May 12 17:01:48 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/8d3c08b5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/3] git commit: Follow up on CASSANDRA-7189
Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Mon May 12 16:47:23 2014 -0500
Committer: Yuki Morishita <yu...@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);