summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_mnesia.erl14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 9bebae4bc2..c6441b689b 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -552,9 +552,17 @@ create_local_table_copy(Tab, Type) ->
end,
ok.
-wait_for_replicated_tables() -> wait_for_tables(replicated_table_names()).
-
-wait_for_tables() -> wait_for_tables(table_names()).
+wait_for_replicated_tables() ->
+ AllTablesSet = ordsets:from_list(mnesia:system_info(tables)),
+ ReplicatedTablesSet = ordsets:from_list(replicated_table_names()),
+ wait_for_tables(ordsets:to_list(ordsets:intersection(AllTablesSet,
+ ReplicatedTablesSet))).
+
+wait_for_tables() ->
+ AllTablesSet = ordsets:from_list(mnesia:system_info(tables)),
+ RabbitTablesSet = ordsets:from_list(table_names()),
+ wait_for_tables(ordsets:to_list(ordsets:intersection(AllTablesSet,
+ RabbitTablesSet))).
wait_for_tables(TableNames) ->
case mnesia:wait_for_tables(TableNames, 30000) of