natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
T Jake Luciani 2015-05-08 15:05:02 -04:00
parent 1f23bb4b3d 9e9846e73d
commit e25157901b
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -100,6 +100,7 @@
2.1.6
* Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
* Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
* Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
* Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057)

27
src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
View File

@ -19,6 +19,10 @@ package org.apache.cassandra.concurrent;
import java.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.JVMStabilityInspector;
/**
@ -30,19 +34,42 @@ import org.apache.cassandra.utils.JVMStabilityInspector;
*/
public class DebuggableScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor
{
private static final Logger logger = LoggerFactory.getLogger(DebuggableScheduledThreadPoolExecutor.class);
public static final RejectedExecutionHandler rejectedExecutionHandler = new RejectedExecutionHandler()
{
public void rejectedExecution(Runnable task, ThreadPoolExecutor executor)
{
if (executor.isShutdown())
{
if (!StorageService.instance.isInShutdownHook())
throw new RejectedExecutionException("ScheduledThreadPoolExecutor has shut down.");
logger.debug("ScheduledThreadPoolExecutor has shut down as part of C* shutdown");
}
else
{
throw new AssertionError("Unknown rejection of ScheduledThreadPoolExecutor task");
}
}
};
public DebuggableScheduledThreadPoolExecutor(int corePoolSize, String threadPoolName, int priority)
{
super(corePoolSize, new NamedThreadFactory(threadPoolName, priority));
setRejectedExecutionHandler(rejectedExecutionHandler);
}
public DebuggableScheduledThreadPoolExecutor(int corePoolSize, ThreadFactory threadFactory)
{
super(corePoolSize, threadFactory);
setRejectedExecutionHandler(rejectedExecutionHandler);
}
public DebuggableScheduledThreadPoolExecutor(String threadPoolName)
{
this(1, threadPoolName, Thread.NORM_PRIORITY);
setRejectedExecutionHandler(rejectedExecutionHandler);
}
// We need this as well as the wrapper for the benefit of non-repeating tasks

7
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -204,9 +204,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
private Thread drainOnShutdown = null;
private boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();
public boolean isInShutdownHook()
{
return inShutdownHook;
}
public static IPartitioner getPartitioner()
{
return DatabaseDescriptor.getPartitioner();
@ -613,6 +619,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
@Override
public void runMayThrow() throws InterruptedException
{
inShutdownHook = true;
ExecutorService counterMutationStage = StageManager.getStage(Stage.COUNTER_MUTATION);
ExecutorService mutationStage = StageManager.getStage(Stage.MUTATION);
if (mutationStage.isShutdown() && counterMutationStage.isShutdown())