summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2015-12-22 12:12:31 +0000
committerMichael Klishin <michael@clojurewerkz.org>2015-12-30 09:01:11 +0300
commit1ba9534de152fc0bca9f9d490fdf6480dde0605b (patch)
treef00dacc47c6c68eaefe6b08e5f5e1e42c401c321 /src
parente0c8ceda910f2fc597d276868cab995bcb2fe202 (diff)
downloadrabbitmq-server-git-1ba9534de152fc0bca9f9d490fdf6480dde0605b.tar.gz
Hint to stop_app when running rabbitmqctl reset
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_control_main.erl16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index c064e82ac6..abbdd35cad 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -269,11 +269,23 @@ action(start_app, Node, [], _Opts, Inform) ->
action(reset, Node, [], _Opts, Inform) ->
Inform("Resetting node ~p", [Node]),
- call(Node, {rabbit_mnesia, reset, []});
+ case call(Node, {rabbit_mnesia, reset, []}) of
+ ok -> ok;
+ {error, mnesia_unexpectedly_running} ->
+ Inform("Error: mnesia is still running on node ~p.
+ It need to be stopped with stop_app first", [Node]);
+ Other -> Other
+ end;
action(force_reset, Node, [], _Opts, Inform) ->
Inform("Forcefully resetting node ~p", [Node]),
- call(Node, {rabbit_mnesia, force_reset, []});
+ case call(Node, {rabbit_mnesia, force_reset, []}) of
+ ok -> ok;
+ {error, mnesia_unexpectedly_running} ->
+ Inform("Error: mnesia is still running on node ~p.
+ It need to be stopped with stop_app first", [Node]);
+ Other -> Other
+ end;
action(join_cluster, Node, [ClusterNodeS], Opts, Inform) ->
ClusterNode = list_to_atom(ClusterNodeS),