Merge branch 'cassandra-1.1.0' into cassandra-1.1
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e5722d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e5722d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e5722d7
Branch: refs/heads/trunk
Commit: 6e5722d7bf6f1526131373ac671e26f9be683cf1
Parents: 1c56ec2 7d3416c
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Sun Mar 4 11:15:35 2012 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Sun Mar 4 11:15:35 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 10 ++++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5722d7/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5722d7/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b3c06c8,5fddf4a..7724df6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1873,7 -1871,9 +1873,9 @@@ public class StorageService implements
List<AntiEntropyService.RepairFuture> futures = new
ArrayList<AntiEntropyService.RepairFuture>(ranges.size());
for (Range<Token> range : ranges)
{
- AntiEntropyService.RepairFuture future = forceTableRepair(range,
tableName, columnFamilies);
+ AntiEntropyService.RepairFuture future = forceTableRepair(range,
tableName, isSequential, columnFamilies);
+ if (future == null)
+ continue;
futures.add(future);
// wait for a session to be done with its differencing before
starting the next one
try
@@@ -1913,7 -1913,9 +1915,9 @@@
if (Table.SYSTEM_TABLE.equals(tableName))
return;
- AntiEntropyService.RepairFuture future =
forceTableRepair(getLocalPrimaryRange(), tableName, columnFamilies);
+ AntiEntropyService.RepairFuture future =
forceTableRepair(getLocalPrimaryRange(), tableName, isSequential,
columnFamilies);
+ if (future == null)
+ return;
try
{
future.get();
@@@ -1933,7 -1935,13 +1937,13 @@@
names.add(cfStore.getColumnFamilyName());
}
+ if (names.isEmpty())
+ {
+ logger_.info("No column family to repair for keyspace " +
tableName);
+ return null;
+ }
+
- return AntiEntropyService.instance.submitRepairSession(range,
tableName, names.toArray(new String[names.size()]));
+ return AntiEntropyService.instance.submitRepairSession(range,
tableName, isSequential, names.toArray(new String[names.size()]));
}
public void forceTerminateAllRepairSessions() {
