diff options
| author | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-15 09:20:07 -0600 |
|---|---|---|
| committer | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-15 09:20:07 -0600 |
| commit | 2c57fb14475b2ff4022320882ca17f423f35971f (patch) | |
| tree | 14fa8bfe3d62885c7f0fc19e5064a4c8734513a3 | |
| parent | 2212cec012790f2c1a982e9f2178a01a7af830b0 (diff) | |
| download | rabbitmq-server-git-2c57fb14475b2ff4022320882ca17f423f35971f.tar.gz | |
adding wait_for_tables after database upgrade
| -rw-r--r-- | src/rabbit_mnesia.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 51b6c6a920..eac7dd14b2 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -388,7 +388,8 @@ init_db(ClusterNodes, Force) -> %% True single disc node, attempt upgrade ok = wait_for_tables(), case rabbit_upgrade:maybe_upgrade() of - ok -> ensure_schema_ok(); + ok -> ok = wait_for_tables(), + ensure_schema_ok(); version_not_available -> schema_ok_or_move() end; {[], true, _} -> @@ -559,8 +560,8 @@ wait_for_tables() -> wait_for_tables(table_names()). wait_for_tables(TableNames) -> - Inexistent = TableNames -- mnesia:system_info(tables), - case mnesia:wait_for_tables(TableNames -- Inexistent, 30000) of + Nonexistent = TableNames -- mnesia:system_info(tables), + case mnesia:wait_for_tables(TableNames -- Nonexistent, 30000) of ok -> ok; {timeout, BadTabs} -> throw({error, {timeout_waiting_for_tables, BadTabs}}); |