You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/06/24 01:17:39 UTC
[3/6] cassandra git commit: ColumnFamilyStore.selectAndReference may
block during compaction
ColumnFamilyStore.selectAndReference may block during compaction
patch by benedict; reviewed by aleksey for CASSANDRA-9637
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3caf0e02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3caf0e02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3caf0e02
Branch: refs/heads/trunk
Commit: 3caf0e02970b8da90d154d81d769662057d7c772
Parents: b969496
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jun 24 00:13:55 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jun 24 00:13:55 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 15 +++++++++++++++
.../cassandra/db/compaction/CompactionTask.java | 4 +++-
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3caf0e02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 28b145b..b3c76ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.7
+ * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
* Fix bug in cardinality check when compacting (CASSANDRA-9580)
* Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
Merged from 2.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3caf0e02/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index bd39409..a01bb49 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1851,12 +1851,27 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
public RefViewFragment selectAndReference(Function<DataTracker.View, List<SSTableReader>> filter)
{
+ long failingSince = -1L;
while (true)
{
ViewFragment view = select(filter);
Refs<SSTableReader> refs = Refs.tryRef(view.sstables);
if (refs != null)
return new RefViewFragment(view.sstables, view.memtables, refs);
+ if (failingSince <= 0)
+ {
+ failingSince = System.nanoTime();
+ }
+ else if (TimeUnit.MILLISECONDS.toNanos(100) > System.nanoTime() - failingSince)
+ {
+ List<SSTableReader> released = new ArrayList<>();
+ for (SSTableReader reader : view.sstables)
+ if (reader.selfRef().globalCount() == 0)
+ released.add(reader);
+ logger.info("Spinning trying to capture released readers {}", released);
+ logger.info("Spinning trying to capture all readers {}", view.sstables);
+ failingSince = System.nanoTime();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3caf0e02/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 392034c..751f8f3 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -45,6 +45,7 @@ import org.apache.cassandra.io.sstable.SSTableWriter;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.CloseableIterator;
+import org.apache.cassandra.utils.concurrent.Refs;
public class CompactionTask extends AbstractCompactionTask
{
@@ -159,7 +160,8 @@ public class CompactionTask extends AbstractCompactionTask
// SSTableScanners need to be closed before markCompactedSSTablesReplaced call as scanners contain references
// to both ifile and dfile and SSTR will throw deletion errors on Windows if it tries to delete before scanner is closed.
// See CASSANDRA-8019 and CASSANDRA-8399
- try (AbstractCompactionStrategy.ScannerList scanners = strategy.getScanners(actuallyCompact))
+ try (Refs<SSTableReader> refs = Refs.ref(actuallyCompact);
+ AbstractCompactionStrategy.ScannerList scanners = strategy.getScanners(actuallyCompact))
{
ci = new CompactionIterable(compactionType, scanners.scanners, controller);
Iterator<AbstractCompactedRow> iter = ci.iterator();