diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
| commit | 4837af6cd04ccb87b5e2399495eff468fa99c1a3 (patch) | |
| tree | 6ce7d0f7fb9dedd25a400d5a016f1ccb3b0d36ac /docs | |
| parent | 008c4eb7f0a9b14838439db934eb98dbe7801dbb (diff) | |
| parent | 5c6d8e523349bb7df418cfff52b99f173a7cc4c1 (diff) | |
| download | rabbitmq-server-git-4837af6cd04ccb87b5e2399495eff468fa99c1a3.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
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 f03145b447..db65572c2a 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -354,7 +354,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 |