Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 196b7ab54 -> c73ec67c0
Ignore FSWriteError in recover() during resetUnsafe() on Windows Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5158e53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5158e53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5158e53 Branch: refs/heads/cassandra-3.0 Commit: c5158e53e8ac9386603f607c67ec7fbaa827c5ae Parents: 5fb4e58 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 28 11:02:58 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 28 11:02:58 2015 -0400 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLog.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5158e53/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java index 63005d7..0e08efe 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -444,7 +444,21 @@ public class CommitLog implements CommitLogMBean { allocator.start(); executor.restartUnsafe(); - return recover(); + try + { + return recover(); + } + catch (FSWriteError e) + { + // Workaround for a class of races that keeps showing up on Windows tests. + // stop/start/reset path on Windows with segment deletion is very touchy/brittle + // and the timing keeps getting screwed up. Rather than chasing our tail further + // or rewriting the CLSM, just report that we didn't recover anything back up + // the chain. This will silence most intermittent test failures on Windows + // and appropriately fail tests that expected segments to be recovered that + // were not. + return 0; + } } /**
