From ce6460cdfc77a19fbc090b2ab871a9bf728c4b99 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 11 Nov 2011 17:56:25 +0000 Subject: [PATCH] Fix race introduced by CASSANDRA-2503 patch by jbellis; reviewed by slebresne for CASSANDRA-3482 git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1200998 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CollationController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 434e6f800b..d628e06f57 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * report compression ratio in CFSMBean (CASSANDRA-3393) * fix incorrect size exception during streaming of counters (CASSANDRA-3481) * (CQL) fix for counter decrement syntax (CASSANDRA-3418) + * Fix race introduced by CASSANDRA-2503 (CASSANDRA-3482) Merged from 0.8: * Make counter shard merging thread safe (CASSANDRA-3178) * fix updating CF row_cache_provider (CASSANDRA-3414) diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java index b59e526163..95042d9d73 100644 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@ -154,7 +154,7 @@ public class CollationController // "hoist up" the requested data into a more recent sstable if (sstablesIterated >= cfs.getMinimumCompactionThreshold() && cfs.getCompactionStrategy() instanceof SizeTieredCompactionStrategy) { - RowMutation rm = new RowMutation(cfs.table.name, new Row(filter.key, returnCF)); + RowMutation rm = new RowMutation(cfs.table.name, new Row(filter.key, returnCF.cloneMe())); try { rm.applyUnsafe(); // skipping commitlog is fine since we're just de-fragmenting existing data