diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-01-24 14:19:44 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-01-24 14:19:44 +0000 |
| commit | 40e2db03844aba0aa5b1d6c859fd5987be1c070d (patch) | |
| tree | c86eac8b945a7e764bad27a1cb017258865e87d3 | |
| parent | f90da3d989d4cc1a8f28bd40799848527bf7bcc8 (diff) | |
| download | rabbitmq-server-git-40e2db03844aba0aa5b1d6c859fd5987be1c070d.tar.gz | |
...however, we should still allow rabbitmqctl reset to work when some nodes are down. (This is what we did before, the difference between reset and force_reset is that force_reset works if mnesia is completely hosed).
| -rw-r--r-- | src/rabbit_mnesia.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index c6b028c545..25326c9986 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -744,9 +744,12 @@ reset(Force) -> false -> ensure_mnesia_dir(), start_mnesia(), + ensure_mnesia_running(), {Nodes, RunningNodes} = try - ok = init(), + %% Force=true here so that reset still works when clustered + %% with a node which is down + ok = init_db(read_cluster_nodes_config(), true), {all_clustered_nodes() -- [Node], running_clustered_nodes() -- [Node]} after |