From 9376fddccf202ec0506f2a94eb0a4f6bdf4a2852 Mon Sep 17 00:00:00 2001 From: Marcus Eriksson Date: Tue, 27 May 2014 10:24:48 +0200 Subject: [PATCH] Copy compaction options to make sure they are reloaded. Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290 --- CHANGES.txt | 1 + .../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index b8c3963451..42a1148d88 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * Add missing iso8601 patterns for date strings (6973) * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) 2.0.8 * Always reallocate buffers in HSHA (CASSANDRA-6285) diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index 276802f0f5..0a857b3753 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction; import java.util.*; import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.RateLimiter; import org.slf4j.Logger; @@ -76,7 +77,7 @@ public abstract class AbstractCompactionStrategy { assert cfs != null; this.cfs = cfs; - this.options = options; + this.options = ImmutableMap.copyOf(options); /* checks must be repeated here, as user supplied strategies might not call validateOptions directly */