Author: jbellis Date: Mon Feb 28 23:50:09 2011 New Revision: 1075594 URL: http://svn.apache.org/viewvc?rev=1075594&view=rev Log: movefile deletions off of scheduledtasks executor patch by Mikael Sitruk; reviewed by jbellis for CASSANDRA-2253
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java?rev=1075594&r1=1075593&r2=1075594&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java Mon Feb 28 23:50:09 2011 @@ -67,7 +67,7 @@ public class SSTableDeletingReference ex // this is tricky because the mmapping might not have been finalized yet, // and delete will fail (on Windows) until it is. additionally, we need to make sure to // delete the data file first, so on restart the others will be recognized as GCable - StorageService.scheduledTasks.schedule(new CleanupTask(), RETRY_DELAY, TimeUnit.MILLISECONDS); + StorageService.tasks.schedule(new CleanupTask(), RETRY_DELAY, TimeUnit.MILLISECONDS); } } @@ -83,7 +83,7 @@ public class SSTableDeletingReference ex { if (attempts++ < DeletionService.MAX_RETRIES) { - StorageService.scheduledTasks.schedule(this, RETRY_DELAY, TimeUnit.MILLISECONDS); + StorageService.tasks.schedule(this, RETRY_DELAY, TimeUnit.MILLISECONDS); return; } else Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1075594&r1=1075593&r2=1075594&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Mon Feb 28 23:50:09 2011 @@ -146,7 +146,16 @@ public class StorageService implements I }}; - public static final RetryingScheduledThreadPoolExecutor scheduledTasks = new RetryingScheduledThreadPoolExecutor("ScheduledTasks"); + /** + * This pool is used for periodic short time execution tasks. + */ + public static final RetryingScheduledThreadPoolExecutor scheduledTasks = new RetryingScheduledThreadPoolExecutor("ScheduledTasks"); + + /** + * This pool is used by tasks that can have long execution, (and usually are non periodic). + */ + public static final RetryingScheduledThreadPoolExecutor tasks = new RetryingScheduledThreadPoolExecutor("NonPeriodicTasks"); + /* This abstraction maintains the token/endpoint metadata information */ private TokenMetadata tokenMetadata_ = new TokenMetadata();