diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-10-22 17:11:44 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-10-22 17:11:44 +0100 |
| commit | b0a04d336f1779c98486df87e6e3fad0febc9141 (patch) | |
| tree | 99f2e90c46177862a2ae6a1c4dcc37475d59b0ba | |
| parent | 8ac1490a286cb94c2ed0283d9f73a41ab0914bc0 (diff) | |
| download | rabbitmq-server-git-b0a04d336f1779c98486df87e6e3fad0febc9141.tar.gz | |
Only attempt upgrade if we are not clustered. wait_for_tables() beforehand should thus be safe.
| -rw-r--r-- | src/rabbit_mnesia.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index cd072b9cb4..2555c2f029 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -378,7 +378,11 @@ init_db(ClusterNodes, Force) -> [] -> case mnesia:system_info(use_dir) of true -> - rabbit_upgrade:maybe_upgrade(dir()), + case is_clustered() of + false -> wait_for_tables(), + rabbit_upgrade:maybe_upgrade(dir()); + _ -> ok + end, case check_schema_integrity() of ok -> ok; |