Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 93478ab46 -> ac70e37d3 refs/heads/trunk a5b90f15c -> 894b7b9a7
Fix commitlog getCompletedTasks to not increment patch by Graham Sanderson; reviewed by jbellis for CASSANDRA-9339 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac70e37d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac70e37d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac70e37d Branch: refs/heads/cassandra-2.1 Commit: ac70e37d39bd11bad682a4a588a6ad5544adabf2 Parents: 93478ab Author: Jonathan Ellis <[email protected]> Authored: Mon May 11 12:59:32 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 11 12:59:32 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac70e37d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5b7843a..6e586a3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.6 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) @@ -87,7 +88,7 @@ Merged from 2.0: * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) - * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856) + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8862) * Fix parallelism adjustment in range and secondary index queries when the first fetch does not satisfy the limit (CASSANDRA-8856) * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac70e37d/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 517ebe3..d9ea683 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java @@ -177,7 +177,7 @@ public abstract class AbstractCommitLogService public long getCompletedTasks() { - return written.incrementAndGet(); + return written.get(); } public long getPendingTasks()
