From 1630ebf6afa6c3ceb4751dfd9bb3e444b99211e2 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 14 Jul 2014 11:11:07 -0500 Subject: [PATCH] (Windows) force range-based repair to non-sequential mode patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7541 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index e1c89220bf..d3393095d3 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) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 77ad4f0720..c6f4ec9ead 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); }