diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-03-20 15:04:59 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-03-20 15:04:59 +0000 |
| commit | 6e8c7da43ef4ab467d12609dfe756ae443122e62 (patch) | |
| tree | 175c5dffb1427dbb7e107b3c149d6d9eb4801750 | |
| parent | 5f424ad41584ac491c8ce84db404e5a5f21635e1 (diff) | |
| download | rabbitmq-server-git-6e8c7da43ef4ab467d12609dfe756ae443122e62.tar.gz | |
Look for cluster nodes in Mnesia's view of the world (in case we are a disc node) and the config file (in case we are a ram node)
| -rw-r--r-- | src/rabbit_upgrade.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 80f50b38b3..003accf2c7 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -119,7 +119,10 @@ remove_backup() -> info("upgrades: Mnesia backup removed~n", []). maybe_upgrade_mnesia() -> - AllNodes = rabbit_mnesia:all_clustered_nodes(), + %% rabbit_mnesia:all_clustered_nodes/0 will return [] at this point + %% if we are a RAM node since Mnesia has not started yet. + AllNodes = lists:usort(rabbit_mnesia:all_clustered_nodes() ++ + rabbit_mnesia:read_cluster_nodes_config()), case rabbit_version:upgrades_required(mnesia) of {error, version_not_available} -> case AllNodes of |