diff options
| -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() -> |