diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-04-16 14:57:48 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-04-16 14:57:48 +0100 |
| commit | 6846869eeade78fccc3b5b9bdf4a881f63d80530 (patch) | |
| tree | eab13ec24f29ac091f973cf4c5112607a8c1e63b | |
| parent | 4f68ebd4e31effe000208ef1b836575427663a36 (diff) | |
| download | rabbitmq-server-6846869eeade78fccc3b5b9bdf4a881f63d80530.tar.gz | |
Further tweaks
| -rw-r--r-- | src/rabbit_mnesia.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 52af28ab..7775aa3f 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -566,6 +566,9 @@ check_cluster_consistency(Node) -> {error, not_found}; {_OTP, _Rabbit, _Hash, {error, _}} -> {error, not_found}; + {_OTP, Rabbit, _Status} -> + %% pre-2013/04 format implies version mismatch + version_error("Rabbit", rabbit_misc:version(), Rabbit); {OTP, Rabbit, Hash, {ok, Status}} -> case check_consistency(OTP, Rabbit, Hash, Node, Status) of {error, _} = E -> E; @@ -819,8 +822,8 @@ find_good_node([]) -> none; find_good_node([Node | Nodes]) -> case rpc:call(Node, rabbit_mnesia, node_info, []) of - {badrpc, _Reason} -> find_good_node(Nodes); - {OTP, Rabbit, Hash, _} -> case check_consistency(OTP, Rabbit, Hash) of + {badrpc, _Reason} -> find_good_node(Nodes); + {OTP, Rabbit, Hash, _} -> case check_consistency(OTP, Rabbit, Hash) of {error, _} -> find_good_node(Nodes); ok -> {ok, Node} end |