Updated Branches: refs/heads/trunk d1361502a -> 5edf94842
Fix shutdown slowness in multithreaded CL. Patch by Benedict Elliot Smith, reviewed by brandonwilliams for CASSANDRA-6578 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5edf9484 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5edf9484 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5edf9484 Branch: refs/heads/trunk Commit: 5edf94842e04aff89a88856bc6dad0918d59c8c0 Parents: d136150 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 14:12:20 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 14:12:20 2014 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edf9484/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java index caa2c65..a00e992 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java @@ -108,7 +108,7 @@ public abstract class AbstractCommitLogService } // if we have lagged this round, we probably have work to do already so we don't sleep - if (sleep < 0) + if (sleep < 0 || !run) continue; try
