Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 aeb7d3f2e -> c1374ae42 refs/heads/trunk 1dcf66b09 -> ec15878ef
ninja fix CommitLogAllocator error suppression on shutdown for CASSANDRA-8474 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1374ae4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1374ae4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1374ae4 Branch: refs/heads/cassandra-2.1 Commit: c1374ae427bb439a4abd6c7284dfe2b5563bc8e1 Parents: aeb7d3f Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Jan 5 16:20:19 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Jan 5 16:20:19 2015 +0000 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1374ae4/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java index 0771b7a..3f7e793 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java @@ -145,8 +145,7 @@ public class CommitLogSegmentManager } catch (InterruptedException e) { - // shutdown signal; exit cleanly - continue; + throw new AssertionError(); } } @@ -536,7 +535,7 @@ public class CommitLogSegmentManager public void shutdown() { run = false; - managerThread.interrupt(); + segmentManagementTasks.add(Callables.<CommitLogSegment>returning(null)); } /**
