Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3b3570c8c -> 2215c491c refs/heads/trunk 7f8a09840 -> 2c15d8212
fix commitlog getPendingTasks to not increment patch by jbellis for CASSANDRA-8862 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2215c491 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2215c491 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2215c491 Branch: refs/heads/cassandra-2.1 Commit: 2215c491c904560a3b2575830b0cfb3e9200b350 Parents: 3b3570c8 Author: Jonathan Ellis <[email protected]> Authored: Wed Feb 25 21:19:02 2015 -0800 Committer: Jonathan Ellis <[email protected]> Committed: Wed Feb 25 21:23:45 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 6 +++--- .../cassandra/db/commitlog/AbstractCommitLogService.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 70641fd..ec5e233 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ 2.1.4 - * Fix parallelism adjustment in range and secondary index - queries when the first fetch does not satisfy the - limit (CASSANDRA-8856) + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856) + * 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) * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842) * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/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 59bf691..517ebe3 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java @@ -182,6 +182,6 @@ public abstract class AbstractCommitLogService public long getPendingTasks() { - return pending.incrementAndGet(); + return pending.get(); } } \ No newline at end of file
