diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-03-18 12:15:51 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-03-18 12:15:51 +0000 |
| commit | 2107f764ee34b8cd309e3226175b68a8dc214b98 (patch) | |
| tree | a699237675223baa43776f69a9e8bad54277618d /src | |
| parent | c5c260889317964b7a64d9e1c7908704e30f456e (diff) | |
| download | rabbitmq-server-git-2107f764ee34b8cd309e3226175b68a8dc214b98.tar.gz | |
Ensure mnesia is stopped for the local upgrade backup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_upgrade.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index b4e1191e51..2c31e6020d 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -182,7 +182,6 @@ primary_upgrade(Upgrades, Nodes) -> mnesia, Upgrades, fun () -> - rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), force_tables(), case Others of [] -> ok; @@ -227,7 +226,8 @@ maybe_upgrade_local() -> {error, version_not_available} -> version_not_available; {error, _} = Err -> throw(Err); {ok, []} -> ok; - {ok, Upgrades} -> apply_upgrades(local, Upgrades, + {ok, Upgrades} -> mnesia:stop(), + apply_upgrades(local, Upgrades, fun () -> ok end) end. @@ -249,6 +249,7 @@ apply_upgrades(Scope, Upgrades, Fun) -> ok = file:delete(lock_filename(BackupDir)), info("~s upgrades: Mnesia dir backed up to ~p~n", [Scope, BackupDir]), + rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), Fun(), [apply_upgrade(Scope, Upgrade) || Upgrade <- Upgrades], info("~s upgrades: All upgrades applied successfully~n", |