diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-01-24 14:15:57 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-01-24 14:15:57 +0000 |
| commit | 5f8175a556def1cb7d35e247a4aabab03f74dc8e (patch) | |
| tree | 28a07e11296f28c300679a1e91a7c64c1980fa06 | |
| parent | 65efc39ab5e6669c4088e5d26d7885ba252dcf58 (diff) | |
| download | rabbitmq-server-5f8175a556def1cb7d35e247a4aabab03f74dc8e.tar.gz | |
Don't force on init() (which fixes bug 24703), plus a little refactor.
| -rw-r--r-- | src/rabbit_mnesia.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index bf997a6f..c6b028c5 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -98,8 +98,7 @@ status() -> init() -> ensure_mnesia_running(), ensure_mnesia_dir(), - ok = init_db(read_cluster_nodes_config(), true, - fun maybe_upgrade_local_or_record_desired/0), + ok = init_db(read_cluster_nodes_config(), false), %% We intuitively expect the global name server to be synced when %% Mnesia is up. In fact that's not guaranteed to be the case - let's %% make it so. @@ -174,8 +173,7 @@ cluster(ClusterNodes, Force) -> %% Join the cluster start_mnesia(), try - ok = init_db(ClusterNodes, Force, - fun maybe_upgrade_local_or_record_desired/0), + ok = init_db(ClusterNodes, Force), ok = create_cluster_nodes_config(ClusterNodes) after stop_mnesia() @@ -501,6 +499,9 @@ delete_previously_running_nodes() -> FileName, Reason}}) end. +init_db(ClusterNodes, Force) -> + init_db(ClusterNodes, Force, fun maybe_upgrade_local_or_record_desired/0). + %% 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 |