svn commit: r945462 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[jbellis]

Author: jbellis
Date: Tue May 18 02:18:45 2010
New Revision: 945462

URL: http://svn.apache.org/viewvc?rev=945462&view=rev
Log:
better defaults for flush sorter + writer executor queue sizes.  patch by 
jbellis; tested by Brandon Williams for CASSANDRA-1100

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=945462&r1=945461&r2=945462&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Tue May 18 02:18:45 2010
@@ -20,6 +20,8 @@
    ColumnFamilyInputFormat (CASSANDRA-1096)
  * do not recalculate cache capacity post-compaction if it's been manually 
    modified (CASSANDRA-1079)
+ * better defaults for flush sorter + writer executor queue sizes
+   (CASSANDRA-1100)
 
 
 0.6.1

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=945462&r1=945461&r2=945462&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Tue May 18 02:18:45 2010
@@ -79,14 +79,14 @@ public class ColumnFamilyStore implement
                                                
Runtime.getRuntime().availableProcessors(),
                                                Integer.MAX_VALUE,
                                                TimeUnit.SECONDS,
-                                               new 
LinkedBlockingQueue<Runnable>(1 + Runtime.getRuntime().availableProcessors()),
+                                               new 
LinkedBlockingQueue<Runnable>(Runtime.getRuntime().availableProcessors()),
                                                new 
NamedThreadFactory("FLUSH-SORTER-POOL"));
     private static ExecutorService flushWriter_
             = new JMXEnabledThreadPoolExecutor(1,
                                                
DatabaseDescriptor.getAllDataFileLocations().length,
                                                Integer.MAX_VALUE,
                                                TimeUnit.SECONDS,
-                                               new 
LinkedBlockingQueue<Runnable>(1 + 2 * 
DatabaseDescriptor.getAllDataFileLocations().length),
+                                               new 
LinkedBlockingQueue<Runnable>(DatabaseDescriptor.getAllDataFileLocations().length),
                                                new 
NamedThreadFactory("FLUSH-WRITER-POOL"));
     private static ExecutorService commitLogUpdater_ = new 
JMXEnabledThreadPoolExecutor("MEMTABLE-POST-FLUSHER");