diff options
author | Matthew Sackman <matthew@rabbitmq.com> | 2013-12-06 12:50:28 +0000 |
---|---|---|
committer | Matthew Sackman <matthew@rabbitmq.com> | 2013-12-06 12:50:28 +0000 |
commit | 29a80ca7ed7d46ddd39d6e381df7e212c07b45e2 (patch) | |
tree | 189eba875b3189f8291b43e5ffeae34c3d59dddb | |
parent | 08c6e4053b517a54f34ccad447e7076cfcb2b16c (diff) | |
download | rabbitmq-server-29a80ca7ed7d46ddd39d6e381df7e212c07b45e2.tar.gz |
Remove unnecessary test.bug25899
-rw-r--r-- | src/rabbit_mnesia.erl | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 3a8fae7f..f27f77c6 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -434,10 +434,8 @@ init_db(ClusterNodes, NodeType, CheckOtherNodes) -> %% First disc node up maybe_force_load(), ok; - {[AnotherNode | _], _, _} -> + {[_ | _], _, _} -> %% Subsequent node in cluster, catch up - ensure_version_ok( - rpc:call(AnotherNode, rabbit_version, recorded, [])), maybe_force_load(), ok = rabbit_table:wait_for_replicated(), ok = rabbit_table:create_local_copy(NodeType) @@ -639,15 +637,6 @@ schema_ok_or_move() -> ok = create_schema() end. -ensure_version_ok({ok, DiscVersion}) -> - DesiredVersion = rabbit_version:desired(), - case rabbit_version:matches(DesiredVersion, DiscVersion) of - true -> ok; - false -> throw({error, {version_mismatch, DesiredVersion, DiscVersion}}) - end; -ensure_version_ok({error, _}) -> - ok = rabbit_version:record_desired(). - %% We only care about disc nodes since ram nodes are supposed to catch %% up only create_schema() -> |