diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 00:53:52 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 00:53:52 +0300 |
| commit | 92c2d59b08115f39b281dd7b55eabfeb707e7565 (patch) | |
| tree | baf632ee4bf18123deee05a776766b01c991d2ad /docs | |
| parent | cd9da9fe1ca76eaec2d72afb402ff5c2afefaaa2 (diff) | |
| parent | 590d717a266922ce76e1b214ea1045408b2401bd (diff) | |
| download | rabbitmq-server-git-92c2d59b08115f39b281dd7b55eabfeb707e7565.tar.gz | |
Merge branch 'master' into rabbitmq-server-988
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmq.conf.example | 7 | ||||
| -rw-r--r-- | docs/rabbitmq.config.example | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example index 9de81548b6..4aead110f0 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -359,7 +359,12 @@ ## Timeout used when waiting for Mnesia tables in a cluster to ## become available. ## -# mnesia_table_loading_timeout = 30000 +# mnesia_table_loading_retry_timeout = 30000 + +## 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 ## Size in bytes below which to embed messages in the queue index. See ## http://www.rabbitmq.com/persistence-conf.html diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index b31ec4d673..3e1137aa8b 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -321,7 +321,12 @@ %% Timeout used when waiting for Mnesia tables in a cluster to %% become available. %% - %% {mnesia_table_loading_timeout, 30000}, + %% {mnesia_table_loading_retry_timeout, 30000}, + + %% 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}, %% Size in bytes below which to embed messages in the queue index. See %% http://www.rabbitmq.com/persistence-conf.html |