diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-06-03 20:45:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 20:45:17 +0300 |
| commit | 5d96d1d8c6c423f75f6b9c77a605a7657f03de23 (patch) | |
| tree | 335ab1069b0578759f86bd266325c6e1283bb046 | |
| parent | a986322540c94009c94833157f95e0c0cbf6729a (diff) | |
| parent | 06b35575c88d8653bf6ca981699503c6897bb2fa (diff) | |
| download | rabbitmq-server-git-5d96d1d8c6c423f75f6b9c77a605a7657f03de23.tar.gz | |
Merge pull request #2362 from rabbitmq/rabbitmq_server_2324
Use the newly defined MSG_STORE_WORKER_WAIT for rabbit_msg_store
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | priv/schema/rabbit.schema | 6 | ||||
| -rw-r--r-- | src/rabbit_vhost_msg_store.erl | 2 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 14 |
4 files changed, 22 insertions, 1 deletions
@@ -29,6 +29,7 @@ define PROJECT_ENV {connection_max, infinity}, {heartbeat, 60}, {msg_store_file_size_limit, 16777216}, + {msg_store_shutdown_timeout, 600000}, {fhc_write_buffering, true}, {fhc_read_buffering, false}, {queue_index_max_journal_entries, 32768}, diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 9552fb0cf3..b81ba0f1c4 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -1090,6 +1090,12 @@ end}. {mapping, "mnesia_table_loading_retry_limit", "rabbit.mnesia_table_loading_retry_limit", [{datatype, integer}]}. +{mapping, "message_store_shutdown_timeout", "rabbit.msg_store_shutdown_timeout", + [ + {datatype, integer}, + {validators, ["non_zero_positive_integer"]} + ]}. + %% Size in bytes below which to embed messages in the queue index. See %% https://www.rabbitmq.com/persistence-conf.html %% diff --git a/src/rabbit_vhost_msg_store.erl b/src/rabbit_vhost_msg_store.erl index 492c9ce5c7..6bdd33ec1a 100644 --- a/src/rabbit_vhost_msg_store.erl +++ b/src/rabbit_vhost_msg_store.erl @@ -29,7 +29,7 @@ start(VHost, Type, ClientRefs, StartupFunState) when is_list(ClientRefs); supervisor2:start_child(VHostSup, {Type, {rabbit_msg_store, start_link, [Type, VHostDir, ClientRefs, StartupFunState]}, - transient, ?WORKER_WAIT, worker, [rabbit_msg_store]}); + transient, ?MSG_STORE_WORKER_WAIT, worker, [rabbit_msg_store]}); %% we can get here if a vhost is added and removed concurrently %% e.g. some integration tests do it {error, {no_such_vhost, VHost}} = E -> diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index e2384e178b..a86fd95c76 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -626,6 +626,20 @@ credential_validator.regexp = ^abc\\d+", ]}], []}, + {rabbit_msg_store_shutdown_timeout, + "message_store_shutdown_timeout = 600000", + [{rabbit, [ + {msg_store_shutdown_timeout, 600000} + ]}], + []}, + + {rabbit_mnesia_table_loading_retry_timeout, + "mnesia_table_loading_retry_timeout = 45000", + [{rabbit, [ + {mnesia_table_loading_retry_timeout, 45000} + ]}], + []}, + {log_syslog_settings, "log.syslog = true log.syslog.identity = rabbitmq |