Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3fab711ee -> 81bf2b088
Allow c* to be shutdown in an embedded mode - make SlabPoolCleaner a daemon patch by dbrosius reviewed by jbellis for cassandra-5635 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81bf2b08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81bf2b08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81bf2b08 Branch: refs/heads/cassandra-2.1 Commit: 81bf2b08895336b7f650624b7a581ccc5e2dbf26 Parents: 3fab711 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon May 12 20:10:28 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon May 12 20:10:28 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/memory/MemtableCleanerThread.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/81bf2b08/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 58c6277..4abb285 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * Upgrade NBHM lib (CASSANDRA-7128) * Optimize netty server (CASSANDRA-6861) * Fix repair hang when given CF does not exist (CASSANDRA-7189) + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635) Merged from 2.0: * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) http://git-wip-us.apache.org/repos/asf/cassandra/blob/81bf2b08/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java b/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java index 9950e49..5a90463 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java +++ b/src/java/org/apache/cassandra/utils/memory/MemtableCleanerThread.java @@ -40,6 +40,7 @@ class MemtableCleanerThread<P extends MemtablePool> extends Thread super(pool.getClass().getSimpleName() + "Cleaner"); this.pool = pool; this.cleaner = cleaner; + setDaemon(true); } boolean needsCleaning()
