diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-07-21 17:19:01 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-07-21 17:19:01 +0100 |
| commit | cb5cb8067aff39d52a672e8fc0910a6cc7a4373a (patch) | |
| tree | 6c735d273a4bde6460db5c4110877986b7d52656 | |
| parent | f683b860dc7c39473f1f47f490cdbcba62709c38 (diff) | |
| download | rabbitmq-server-cb5cb8067aff39d52a672e8fc0910a6cc7a4373a.tar.gz | |
bring branch closer to default
| -rw-r--r-- | src/rabbit_mnesia.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 27672874..4d5a6e71 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -515,12 +515,10 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> ok = create_schema(true); {[], true, true} -> %% We're the first node up - ok = case rabbit_upgrade:maybe_upgrade_local() of - ok -> - ensure_schema_integrity(); - version_not_available -> - schema_ok_or_move() - end; + case rabbit_upgrade:maybe_upgrade_local() of + ok -> ensure_schema_integrity(); + version_not_available -> ok = schema_ok_or_move() + end; {[AnotherNode|_], _, _} -> %% Subsequent node in cluster, catch up ensure_version_ok( @@ -538,7 +536,8 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> %% We've taken down mnesia, so ram nodes will need %% to re-sync case is_disc_node() of - false -> mnesia:start(), + false -> rabbit_misc:ensure_ok(mnesia:start(), + cannot_start_mnesia), ensure_mnesia_running(), mnesia:change_config(extra_db_nodes, ProperClusterNodes), |