summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-11-10 19:45:20 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-11-10 19:45:20 +0300
commit4837af6cd04ccb87b5e2399495eff468fa99c1a3 (patch)
tree6ce7d0f7fb9dedd25a400d5a016f1ccb3b0d36ac /priv
parent008c4eb7f0a9b14838439db934eb98dbe7801dbb (diff)
parent5c6d8e523349bb7df418cfff52b99f173a7cc4c1 (diff)
downloadrabbitmq-server-git-4837af6cd04ccb87b5e2399495eff468fa99c1a3.tar.gz
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'priv')
-rw-r--r--priv/schema/rabbitmq.schema12
1 files changed, 10 insertions, 2 deletions
diff --git a/priv/schema/rabbitmq.schema b/priv/schema/rabbitmq.schema
index 687101dd74..150a26b60d 100644
--- a/priv/schema/rabbitmq.schema
+++ b/priv/schema/rabbitmq.schema
@@ -845,9 +845,17 @@ end}.
%% Timeout used when waiting for Mnesia tables in a cluster to
%% become available.
%%
-%% {mnesia_table_loading_timeout, 30000},
+%% {mnesia_table_loading_retry_timeout, 30000},
-{mapping, "mnesia_table_loading_timeout", "rabbit.mnesia_table_loading_timeout",
+{mapping, "mnesia_table_loading_retry_timeout", "rabbit.mnesia_table_loading_retry_timeout",
+ [{datatype, integer}]}.
+
+%% Retries when waiting for Mnesia tables in the cluster startup. Note that
+%% this setting is not applied to Mnesia upgrades or node deletions.
+%%
+%% {mnesia_table_loading_retry_limit, 10},
+
+{mapping, "mnesia_table_loading_retry_limit", "rabbit.mnesia_table_loading_retry_limit",
[{datatype, integer}]}.
%% Size in bytes below which to embed messages in the queue index. See