maybe_remove_backup is safe when returning version_not_available since we would not have taken a backup in the first place. However, this is not exactly obvious, so let's not do that.

1 files changed, 9 insertions, 10 deletions

diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index b9c7b8dce2..73c9ee2b3e 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -273,16 +273,15 @@ node_running(Node) ->
 %% -------------------------------------------------------------------
 
 maybe_upgrade_local() ->
-    Res = case rabbit_version:upgrades_required(local) of
-              {error, version_not_available} -> version_not_available;
-              {error, _} = Err               -> throw(Err);
-              {ok, []}                       -> ok;
-              {ok, Upgrades}                 -> mnesia:stop(),
-                                                apply_upgrades(local, Upgrades,
-                                                               fun () -> ok end)
-          end,
-    maybe_remove_backup(),
-    Res.
+    case rabbit_version:upgrades_required(local) of
+        {error, version_not_available} -> version_not_available;
+        {error, _} = Err               -> throw(Err);
+        {ok, []}                       -> maybe_remove_backup();
+        {ok, Upgrades}                 -> mnesia:stop(),
+                                          apply_upgrades(local, Upgrades,
+                                                         fun () -> ok end),
+                                          maybe_remove_backup()
+    end.
 
 %% -------------------------------------------------------------------