summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-01-06 23:28:31 +0800
committerMichael Klishin <mklishin@pivotal.io>2017-01-06 23:28:31 +0800
commitf2e4139eeb52e599d5b9a5c465ac1a94f3e992df (patch)
tree4dab2acd301e63d49013e98541abf0f0841ae3fe
parent4bd7bb481423e714227a4b2d4a9587b7d501b841 (diff)
parent8e04bdd1ffde27fe1fb5dc3084469fcf2c2493f2 (diff)
downloadrabbitmq-server-git-f2e4139eeb52e599d5b9a5c465ac1a94f3e992df.tar.gz
Merge branch 'stable'
-rw-r--r--src/rabbit_table.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rabbit_table.erl b/src/rabbit_table.erl
index c8946e179d..cae47c08a9 100644
--- a/src/rabbit_table.erl
+++ b/src/rabbit_table.erl
@@ -18,7 +18,8 @@
-export([create/0, create_local_copy/1, wait_for_replicated/1, wait/1,
force_load/0, is_present/0, is_empty/0, needs_default_data/0,
- check_schema_integrity/1, clear_ram_only_tables/0, retry_timeout/0]).
+ check_schema_integrity/1, clear_ram_only_tables/0, retry_timeout/0,
+ wait_for_replicated/0]).
-include("rabbit.hrl").
@@ -28,6 +29,7 @@
-spec create() -> 'ok'.
-spec create_local_copy('disc' | 'ram') -> 'ok'.
-spec wait_for_replicated(retry()) -> 'ok'.
+-spec wait_for_replicated() -> 'ok'.
-spec wait([atom()]) -> 'ok'.
-spec retry_timeout() -> {non_neg_integer() | infinity, non_neg_integer()}.
-spec force_load() -> 'ok'.
@@ -76,6 +78,11 @@ create_local_copy(ram) ->
create_local_copies(ram),
create_local_copy(schema, ram_copies).
+%% This arity only exists for backwards compatibility with certain
+%% plugins. See https://github.com/rabbitmq/rabbitmq-clusterer/issues/19.
+wait_for_replicated() ->
+ wait_for_replicated(false).
+
wait_for_replicated(Retry) ->
wait([Tab || {Tab, TabDef} <- definitions(),
not lists:member({local_content, true}, TabDef)], Retry).