You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/08/04 14:56:03 UTC
[1/2] cassandra git commit: CASSANDRA-9712 follow-up: fix re-enabling
compaction via CQL
Repository: cassandra
Updated Branches:
refs/heads/trunk becee6ae4 -> 55a9b1b7f
CASSANDRA-9712 follow-up: fix re-enabling compaction via CQL
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0eebd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be0eebd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be0eebd2
Branch: refs/heads/trunk
Commit: be0eebd20b6edf5c4de5d0e43132ead5b2bd0f4b
Parents: b31845c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 4 15:56:08 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 4 15:56:08 2015 +0300
----------------------------------------------------------------------
.../cassandra/db/compaction/CompactionStrategyManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be0eebd2/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index d1b004d..e5aff5d 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.notifications.*;
+import org.apache.cassandra.schema.CompactionParams;
/**
* Manages the compaction strategies.
@@ -49,6 +50,7 @@ public class CompactionStrategyManager implements INotificationConsumer
private volatile AbstractCompactionStrategy unrepaired;
private volatile boolean enabled = true;
public boolean isActive = true;
+ private volatile CompactionParams params;
public CompactionStrategyManager(ColumnFamilyStore cfs)
{
@@ -56,7 +58,8 @@ public class CompactionStrategyManager implements INotificationConsumer
logger.debug("{} subscribed to the data tracker.", this);
this.cfs = cfs;
reload(cfs.metadata);
- enabled = cfs.metadata.params.compaction.isEnabled();
+ params = cfs.metadata.params.compaction;
+ enabled = params.isEnabled();
}
/**
@@ -167,6 +170,7 @@ public class CompactionStrategyManager implements INotificationConsumer
unrepaired.shutdown();
repaired = metadata.createCompactionStrategyInstance(cfs);
unrepaired = metadata.createCompactionStrategyInstance(cfs);
+ params = metadata.params.compaction;
if (disabledWithJMX || !shouldBeEnabled())
disable();
else
@@ -426,7 +430,7 @@ public class CompactionStrategyManager implements INotificationConsumer
public boolean shouldBeEnabled()
{
- return cfs.metadata.params.compaction.isEnabled();
+ return params.isEnabled();
}
public String getName()
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55a9b1b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55a9b1b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55a9b1b7
Branch: refs/heads/trunk
Commit: 55a9b1b7fb17f176201b2990346f871d968598aa
Parents: becee6a be0eebd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 4 15:56:43 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 4 15:56:43 2015 +0300
----------------------------------------------------------------------
.../cassandra/db/compaction/CompactionStrategyManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------