synchronize LCS getEstimatedTasks to avoid CME patch by jbellis; reviewed by slebresne for CASSANDRA-4255
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/641b021d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/641b021d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/641b021d Branch: refs/heads/trunk Commit: 641b021d3c820c7ef8edd698554a7fc44c6ce9f3 Parents: 48438ff Author: Jonathan Ellis <[email protected]> Authored: Mon May 21 11:49:20 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 21 11:49:20 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/db/compaction/LeveledManifest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/641b021d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d1d00f9..15f3c8a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 1.0.11 + * synchronize LCS getEstimatedTasks to avoid CME (CASSANDRA-4255) * ensure unique streaming session id's (CASSANDRA-4223) + 1.0.10 * fix maxTimestamp to include row tombstones (CASSANDRA-4116) * avoid streaming empty files with bulk loader if sstablewriter errors out http://git-wip-us.apache.org/repos/asf/cassandra/blob/641b021d/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 0d949fc..4e13640 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -445,7 +445,7 @@ public class LeveledManifest return generations[i]; } - public int getEstimatedTasks() + public synchronized int getEstimatedTasks() { long tasks = 0; for (int i = generations.length - 1; i >= 0; i--)
