summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-06-03 20:27:05 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-06-03 20:27:05 +0300
commitc8b4adacffeedde5dbf5d2c86a5e20ddb145103a (patch)
treefe3fb44fd7d6a7c501a42b6f93d302ca1f2c2dc1
parent30bd4bb0a62b59775780f66ce0bde461ebc4a41b (diff)
downloadrabbitmq-server-git-c8b4adacffeedde5dbf5d2c86a5e20ddb145103a.tar.gz
Expose new message store worker timeout setting to rabbitmq.conf
Part of #2324.
-rw-r--r--priv/schema/rabbit.schema6
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets14
2 files changed, 20 insertions, 0 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 9552fb0cf3..1d95e5e0b3 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.message_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/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 96930a375b..4923195a25 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -602,6 +602,20 @@ credential_validator.regexp = ^abc\\d+",
]}],
[]},
+ {rabbit_message_store_shutdown_timeout,
+ "message_store_shutdown_timeout = 600000",
+ [{rabbit, [
+ {message_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