diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-23 11:53:59 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-23 11:53:59 +0000 |
| commit | 8b16025be7faf2a5a4d4e403d2150a97e03994be (patch) | |
| tree | 1436d3dea6628dfed94eeb8332404a07441f75a1 | |
| parent | d83eeb5afcca8c28b9271c9ce03cbb4388432437 (diff) | |
| download | rabbitmq-server-8b16025be7faf2a5a4d4e403d2150a97e03994be.tar.gz | |
New decree is that you're not meant to match against ensure_stuff calls
| -rw-r--r-- | src/rabbit_mnesia.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index ff1b8c97..6ba9e60a 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -437,8 +437,9 @@ init_db(ClusterNodes, Force, DoSecondaryLocalUpgrades) -> %% We're the first node up case rabbit_upgrade:maybe_upgrade_local() of ok -> ensure_schema_integrity(); - version_not_available -> schema_ok_or_move() - end; + version_not_available -> ok = schema_ok_or_move() + end, + ok; {[AnotherNode|_], _} -> %% Subsequent node in cluster, catch up ensure_version_ok( @@ -462,7 +463,8 @@ init_db(ClusterNodes, Force, DoSecondaryLocalUpgrades) -> end; false -> ok end, - ensure_schema_integrity() + ensure_schema_integrity(), + ok end; {error, Reason} -> %% one reason we may end up here is if we try to join diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 39a42ef2..87a22363 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -135,7 +135,7 @@ maybe_upgrade_mnesia() -> ok; {ok, Upgrades} -> rabbit:prepare(), %% Ensure we have logs for this - ok = ensure_backup_taken(), + ensure_backup_taken(), case upgrade_mode(AllNodes) of primary -> primary_upgrade(Upgrades, AllNodes); secondary -> secondary_upgrade(AllNodes) @@ -251,12 +251,14 @@ maybe_upgrade_local() -> case rabbit_version:upgrades_required(local) of {error, version_not_available} -> version_not_available; {error, _} = Err -> throw(Err); - {ok, []} -> ok = ensure_backup_removed(); + {ok, []} -> ensure_backup_removed(), + ok; {ok, Upgrades} -> mnesia:stop(), - ok = ensure_backup_taken(), + ensure_backup_taken(), ok = apply_upgrades(local, Upgrades, fun () -> ok end), - ok = ensure_backup_removed() + ensure_backup_removed(), + ok end. %% ------------------------------------------------------------------- |