You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/15 16:57:44 UTC
[03/10] git commit: (Windows) force range-based repair to
non-sequential mode patch by Josh McKenzie;
reviewed by jbellis for CASSANDRA-7541
(Windows) force range-based repair to non-sequential mode
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7541
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1630ebf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1630ebf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1630ebf6
Branch: refs/heads/cassandra-2.1
Commit: 1630ebf6afa6c3ceb4751dfd9bb3e444b99211e2
Parents: a454461
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jul 14 11:11:07 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jul 14 11:11:07 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1630ebf6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e1c8922..d339309 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528)
* Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1630ebf6/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 77ad4f0..c6f4ec9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2544,6 +2544,12 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
logger.info("starting user-requested repair of range {} for keyspace {} and column families {}",
repairingRange, keyspaceName, columnFamilies);
+
+ if (!FBUtilities.isUnix() && isSequential)
+ {
+ logger.warn("Snapshot-based repair is not yet supported on Windows. Reverting to parallel repair.");
+ isSequential = false;
+ }
return forceRepairAsync(keyspaceName, isSequential, dataCenters, hosts, repairingRange, columnFamilies);
}