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/05/01 12:40:10 UTC
[2/3] cassandra git commit: Reduce runWithCompactionsDisabled poll
interval to 1ms
Reduce runWithCompactionsDisabled poll interval to 1ms
patch by ariel; reviewed by benedict for CASSANDRA-9271
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fcf8dfa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fcf8dfa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fcf8dfa
Branch: refs/heads/trunk
Commit: 5fcf8dfad2f2c370db89562695b53ae4ee77a33d
Parents: 4f9c9ce
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Fri May 1 11:38:09 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Fri May 1 11:38:09 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fcf8dfa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 59b1182..55b474b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.6
+ * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
* Fix PITR commitlog replay (CASSANDRA-9195)
* GCInspector logs very different times (CASSANDRA-9124)
* Fix deleting from an empty list (CASSANDRA-9198)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fcf8dfa/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 f329a2b..bb23332 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2582,7 +2582,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
while (System.nanoTime() - start < delay)
{
if (CompactionManager.instance.isCompacting(selfWithIndexes))
- Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+ Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MILLISECONDS);
else
break;
}