Repository: cassandra Updated Branches: refs/heads/cassandra-3.X 07f990bc2 -> 8d1c33fa9 refs/heads/trunk 5364310bf -> a92ca6154
nodetool stopdaemon errors out patch by Corentin Chary; reviewed by jasobrown for CASSANDRA-13030 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d1c33fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1c33fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d1c33fa Branch: refs/heads/cassandra-3.X Commit: 8d1c33fa920c8e0897448b4390c66cec5ec56cde Parents: 07f990b Author: Corentin Chary <c.ch...@criteo.com> Authored: Sun Dec 11 10:34:21 2016 +0100 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Mon Dec 12 10:39:54 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1c33fa/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ed0fc14..7a7f21c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.12 + * nodetool stopdaemon errors out (CASSANDRA-13030) * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) * Add mutation size and batch metrics (CASSANDRA-12649) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1c33fa/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java index 79a499a..24c8920 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java +++ b/src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java @@ -19,6 +19,7 @@ package org.apache.cassandra.tools.nodetool; import io.airlift.command.Command; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; import org.apache.cassandra.utils.JVMStabilityInspector; @@ -31,6 +32,7 @@ public class StopDaemon extends NodeToolCmd { try { + DatabaseDescriptor.toolInitialization(); probe.stopCassandraDaemon(); } catch (Exception e) {