diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-06-02 11:01:47 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-06-02 11:01:47 +0100 |
| commit | f60aa1e22a41c4416fcf92238557fbadc0b47407 (patch) | |
| tree | 0c393a6498e3a751bb179d874d54d796da49ebee /src | |
| parent | c2a311575a52fabdfd110e1071bf4b8d2bacdc79 (diff) | |
| parent | 1dbc4d1d0fdc0870353168f47cb674c6dde48ebf (diff) | |
| download | rabbitmq-server-git-f60aa1e22a41c4416fcf92238557fbadc0b47407.tar.gz | |
Merging default into bug23554
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 87a5f44ea7..8d5c86464c 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -92,6 +92,10 @@ init() -> ensure_mnesia_dir(), ok = init_db(read_cluster_nodes_config(), true, fun maybe_upgrade_local_or_record_desired/0), + %% 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. + ok = global:sync(), ok. is_db_empty() -> diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index 04744aa461..4b2055970e 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -42,8 +42,8 @@ -spec(internal_exchanges/0 :: () -> 'ok'). -spec(user_to_internal_user/0 :: () -> 'ok'). -spec(topic_trie/0 :: () -> 'ok'). --spec(exchange_event_serial/0 :: () -> 'ok'). -spec(semi_durable_route/0 :: () -> 'ok'). +-spec(exchange_event_serial/0 :: () -> 'ok'). -spec(trace_exchanges/0 :: () -> 'ok'). -spec(mirror_pids/0 :: () -> 'ok'). -spec(gm/0 :: () -> 'ok'). |