diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-09-08 14:11:47 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-09-08 14:11:47 +0100 |
| commit | ffee584f980530175d4e37465dd8faaf0b102359 (patch) | |
| tree | 7dc1a66e7b467270b37ac4e159f1e004216d7152 | |
| parent | 83c1990bb3640b81fd84b727e92d87d6c90c5f8e (diff) | |
| download | rabbitmq-server-bug26363.tar.gz | |
Filter out nodes where Mnesia is not running.bug26363
| -rw-r--r-- | src/rabbit_mnesia.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 17fca7bb..880c30eb 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -801,14 +801,15 @@ find_auto_cluster_node([Node | Nodes]) -> find_auto_cluster_node(Nodes) end, case rpc:call(Node, rabbit_mnesia, node_info, []) of - {badrpc, _} = Reason -> Fail("~p~n", [Reason]); + {badrpc, _} = Reason -> Fail("~p~n", [Reason]); %% old delegate hash check - {_OTP, Rabbit, _Hash, _} -> Fail("version ~s~n", [Rabbit]); - {OTP, Rabbit, _} -> case check_consistency(OTP, Rabbit) of - {error, _} -> Fail("versions ~p~n", - [{OTP, Rabbit}]); - ok -> {ok, Node} - end + {_OTP, RMQ, _Hash, _} -> Fail("version ~s~n", [RMQ]); + {_OTP, _RMQ, {error, _} = E} -> Fail("~p~n", [E]); + {OTP, RMQ, _} -> case check_consistency(OTP, RMQ) of + {error, _} -> Fail("versions ~p~n", + [{OTP, RMQ}]); + ok -> {ok, Node} + end end. is_only_clustered_disc_node() -> |