You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by zz...@apache.org on 2016/09/20 02:32:11 UTC
[05/50] [abbrv] cassandra git commit: Do not shut down
BatchlogManager twice during drain
Do not shut down BatchlogManager twice during drain
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for CASSANDRA-12504
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b89ffe73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89ffe73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b89ffe73
Branch: refs/heads/cassandra-3.9
Commit: b89ffe730e80cfc097aea70d747f55e87fb1ed90
Parents: 431ecdb
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Aug 23 14:08:05 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Aug 26 09:36:09 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b89ffe73/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9bd0434..d6f2a9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
* Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
* Calculate last compacted key on startup (CASSANDRA-6216)
* Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b89ffe73/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 2a167ff..498a5ee 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -4017,8 +4017,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
FBUtilities.waitOnFutures(flushes);
- BatchlogManager.instance.shutdown();
-
HintsService.instance.shutdownBlocking();
// Interrupt on going compaction and shutdown to prevent further compaction