summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-11-09 17:00:36 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-11-09 17:00:36 +0000
commit72d6d7c40b8afc88a767c85762bacdac49463588 (patch)
treeef93cf24da8ec2160e83cfb20b3171f1b5630e63
parent0054b0ce511b114e7e342414ec14fd2df125c1e5 (diff)
downloadrabbitmq-server-git-72d6d7c40b8afc88a767c85762bacdac49463588.tar.gz
Check both our version and the remote version. This is TRTTD I think, and has the side effect that we write our version out on the subsequent node.
-rw-r--r--src/rabbit_mnesia.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 9bb701434a..340b785bdd 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -394,6 +394,7 @@ init_db(ClusterNodes, Force) ->
ok = create_schema();
{[AnotherNode|_], _, _} ->
%% Subsequent node in cluster, catch up
+ version_ok_or_exit(rabbit_upgrade:read_version()),
version_ok_or_exit(
rpc:call(AnotherNode, rabbit_upgrade, read_version, [])),
IsDiskNode = ClusterNodes == [] orelse