Blame rabbitmq-server-0007-Don-t-die-in-case-of-faulty-node.patch
|
 |
80e8d6 |
From: Peter Lemenkov <lemenkov@redhat.com>
|
|
|
80e8d6 |
Date: Fri, 22 Jul 2016 17:15:02 +0200
|
|
|
80e8d6 |
Subject: [PATCH] Don't die in case of faulty node
|
|
|
80e8d6 |
|
|
|
80e8d6 |
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
|
|
|
80e8d6 |
|
|
|
80e8d6 |
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
|
|
|
80e8d6 |
index 1a98dcc..9621af8 100644
|
|
|
80e8d6 |
--- a/src/rabbit_control_main.erl
|
|
|
80e8d6 |
+++ b/src/rabbit_control_main.erl
|
|
|
80e8d6 |
@@ -975,6 +975,9 @@ nodes_in_cluster(Node, Timeout) ->
|
|
|
80e8d6 |
unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running], Timeout).
|
|
|
80e8d6 |
|
|
|
80e8d6 |
alarms_by_node(Name) ->
|
|
|
80e8d6 |
- Status = unsafe_rpc(Name, rabbit, status, []),
|
|
|
80e8d6 |
- {_, As} = lists:keyfind(alarms, 1, Status),
|
|
|
80e8d6 |
- {Name, As}.
|
|
|
80e8d6 |
+ case rpc_call(Name, rabbit, status, []) of
|
|
|
80e8d6 |
+ {badrpc,nodedown} -> {Name, [nodedown]};
|
|
|
80e8d6 |
+ Status ->
|
|
|
80e8d6 |
+ {_, As} = lists:keyfind(alarms, 1, Status),
|
|
|
80e8d6 |
+ {Name, As}
|
|
|
80e8d6 |
+ end.
|