diff options
| -rw-r--r-- | src/rabbit_mnesia.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index d8086b567a..11e9a178ff 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -141,7 +141,8 @@ running_clustered_nodes() -> forget_other_nodes() -> Nodes = all_clustered_nodes() -- [node()], - [{atomic, ok} = mnesia:del_table_copy(schema, Node) || Node <- Nodes]. + [{atomic, ok} = mnesia:del_table_copy(schema, Node) || Node <- Nodes], + ok. empty_ram_only_tables() -> Node = node(), @@ -467,7 +468,8 @@ reset_fun(ProperClusterNodes) -> cannot_delete_schema), rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), - {ok, _} = mnesia:change_config(extra_db_nodes, ProperClusterNodes) + {ok, _} = mnesia:change_config(extra_db_nodes, ProperClusterNodes), + ok end. create_schema() -> diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 7e59faaf43..48c00d69ce 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -36,8 +36,8 @@ -type(scope() :: 'mnesia' | 'local'). -type(version() :: [step()]). -%% TODO update -%%-spec(maybe_upgrade/1 :: ([scope()]) -> 'ok' | 'version_not_available'). +-spec(maybe_upgrade/2 :: ([scope()], fun (() -> 'ok')) + -> 'ok' | 'version_not_available'). -spec(read_version/0 :: () -> rabbit_types:ok_or_error2(version(), any())). -spec(write_version/0 :: () -> 'ok'). -spec(desired_version/0 :: () -> version()). @@ -147,7 +147,7 @@ apply_upgrades(Upgrades, Fun) -> %% is not intuitive. Remove it. ok = file:delete(lock_filename(BackupDir)), info("Upgrades: Mnesia dir backed up to ~p~n", [BackupDir]), - Fun(), + ok = Fun(), [apply_upgrade(Upgrade) || Upgrade <- Upgrades], info("Upgrades: All upgrades applied successfully~n", []), ok = write_version(), |