From 641b021d3c820c7ef8edd698554a7fc44c6ce9f3 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 21 May 2012 11:49:20 -0500 Subject: [PATCH] synchronize LCS getEstimatedTasks to avoid CME patch by jbellis; reviewed by slebresne for CASSANDRA-4255 --- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/compaction/LeveledManifest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index d1d00f9ed7..15f3c8a36e 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 diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 0d949fc5ae..4e13640cd8 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--)