Author: jbellis
Date: Tue Jan 18 02:56:18 2011
New Revision: 1060170
URL: http://svn.apache.org/viewvc?rev=1060170&view=rev
Log:
check more frequently for memtable expiration
patch by Peter Schuller; reviewed by jbellis for CASSANDRA-2000
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1060170&r1=1060169&r2=1060170&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Jan 18 02:56:18 2011
@@ -23,6 +23,7 @@
* zero-copy reads (CASSANDRA-1714)
* fix copy bounds for word Text in wordcount demo (CASSANDRA-1993)
* fixes for contrib/javautils (CASSANDRA-1979)
+ * check more frequently for memtable expiration (CASSANDRA-2000)
0.7.0-final
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java?rev=1060170&r1=1060169&r2=1060170&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Table.java
Tue Jan 18 02:56:18 2011
@@ -295,7 +295,7 @@ public class Table
int minCheckMs = Integer.MAX_VALUE;
for (ColumnFamilyStore cfs : columnFamilyStores.values())
{
- minCheckMs = Math.min(minCheckMs, cfs.getMemtableFlushAfterMins()
* 60 * 1000);
+ minCheckMs = Math.min(minCheckMs, cfs.getMemtableFlushAfterMins()
* 60 * 1000 / 10);
}
Runnable runnable = new Runnable()
