diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-09 17:12:20 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-09 17:12:20 +0100 |
| commit | 46ba4d4f986b325625d6b1853fe9eb046fe52a52 (patch) | |
| tree | 933db0dd2a80c19b08767bbd4028785fbb7b0ab0 | |
| parent | aabd2c88ffeebec4102c6743c29b1984d4b1c2ab (diff) | |
| parent | ced86f27d75e501f4c21f72decdadbe044088524 (diff) | |
| download | rabbitmq-server-git-46ba4d4f986b325625d6b1853fe9eb046fe52a52.tar.gz | |
merge default
| -rw-r--r-- | src/rabbit_mnesia.erl | 31 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 2 |
2 files changed, 18 insertions, 15 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 7e9346f903..a120b9a33c 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -46,7 +46,7 @@ -spec(dir/0 :: () -> file:filename()). -spec(ensure_mnesia_dir/0 :: () -> 'ok'). -spec(init/0 :: () -> 'ok'). --spec(init_db/3 :: ([node()], boolean(), rabbit_misc:thunk('ok')) -> 'ok'). +-spec(init_db/3 :: ([node()], boolean(), boolean()) -> 'ok'). -spec(is_db_empty/0 :: () -> boolean()). -spec(cluster/1 :: ([node()]) -> 'ok'). -spec(force_cluster/1 :: ([node()]) -> 'ok'). @@ -505,23 +505,13 @@ delete_previously_running_nodes() -> FileName, Reason}}) end. -init_db(ClusterNodes, Force) -> - init_db( - ClusterNodes, Force, - fun () -> - case rabbit_upgrade:maybe_upgrade_local() of - ok -> ok; - %% If we're just starting up a new node we won't have a - %% version - starting_from_scratch -> ok = rabbit_version:record_desired() - end - end). +init_db(ClusterNodes, Force) -> init_db(ClusterNodes, Force, true). %% Take a cluster node config and create the right kind of node - a %% standalone disk node, or disk or ram node connected to the %% specified cluster nodes. If Force is false, don't allow %% connections to offline nodes. -init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> +init_db(ClusterNodes, Force, Upgrade) -> UClusterNodes = lists:usort(ClusterNodes), ProperClusterNodes = UClusterNodes -- [node()], case mnesia:change_config(extra_db_nodes, ProperClusterNodes) of @@ -559,7 +549,20 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> ok = create_local_table_copy(schema, CopyTypeAlt), ok = create_local_table_copies(CopyType), - ok = SecondaryPostMnesiaFun(), + ok = case Upgrade of + true -> + case rabbit_upgrade:maybe_upgrade_local() of + ok -> + ok; + %% If we're just starting up a new node we + %% won't have a version + starting_from_scratch -> + rabbit_version:record_desired() + end; + false -> + ok + end, + %% We've taken down mnesia, so ram nodes will need %% to re-sync case is_disc_node() of diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index e1a7bcaea8..25efb91a13 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -230,7 +230,7 @@ secondary_upgrade(AllNodes) -> false -> AllNodes -- [node()] end, rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), - ok = rabbit_mnesia:init_db(ClusterNodes, true, fun () -> ok end), + ok = rabbit_mnesia:init_db(ClusterNodes, true, false), ok = rabbit_version:record_desired_for_scope(mnesia), ok. |