summaryrefslogtreecommitdiff
path: root/priv/schema
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-11-10 00:53:52 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-11-10 00:53:52 +0300
commit92c2d59b08115f39b281dd7b55eabfeb707e7565 (patch)
treebaf632ee4bf18123deee05a776766b01c991d2ad /priv/schema
parentcd9da9fe1ca76eaec2d72afb402ff5c2afefaaa2 (diff)
parent590d717a266922ce76e1b214ea1045408b2401bd (diff)
downloadrabbitmq-server-git-92c2d59b08115f39b281dd7b55eabfeb707e7565.tar.gz
Merge branch 'master' into rabbitmq-server-988
Diffstat (limited to 'priv/schema')
-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 6ab04f0dac..f31ec5416c 100644
--- a/priv/schema/rabbitmq.schema
+++ b/priv/schema/rabbitmq.schema
@@ -889,9 +889,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