diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-04 14:18:51 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-04 14:18:51 +0000 |
| commit | f94bd56823591959fb820983534b137a6840a8aa (patch) | |
| tree | dcd5a74b886ef5a592b0dbe03b0ef99fa65468fc | |
| parent | a1986871023be08bcee16cf1a55671f5bcb9612c (diff) | |
| download | rabbitmq-server-git-f94bd56823591959fb820983534b137a6840a8aa.tar.gz | |
These two cases are the same.
| -rw-r--r-- | src/rabbit_mnesia.erl | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 2550bdd4dd..f1e007a1d6 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -386,26 +386,19 @@ init_db(ClusterNodes, Force) -> end; true -> ok end, - case {Nodes, mnesia:system_info(use_dir), all_clustered_nodes()} of - {[], true, [_]} -> - %% True single disc node, attempt upgrade + case {Nodes, mnesia:system_info(use_dir)} of + {[], true} -> + %% True single disc node, or master" (i.e. without + %% config) disc node in cluster, attempt upgrade ok = wait_for_tables(), case rabbit_upgrade:maybe_upgrade([mnesia, local]) of ok -> ensure_schema_ok(); version_not_available -> schema_ok_or_move() end; - {[], true, _} -> - %% "Master" (i.e. without config) disc node in cluster, - %% do upgrade - ok = wait_for_tables(), - case rabbit_upgrade:maybe_upgrade([mnesia, local]) of - ok -> ensure_schema_ok(); - version_not_available -> schema_ok_or_move() - end; - {[], false, _} -> + {[], false} -> %% Nothing there at all, start from scratch ok = create_schema(); - {[AnotherNode|_], _, _} -> + {[AnotherNode|_], _} -> %% Subsequent node in cluster, catch up IsDiskNode = ClusterNodes == [] orelse lists:member(node(), ClusterNodes), |