summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2021-05-11 20:30:22 +0300
committerGitHub <noreply@github.com>2021-05-11 20:30:22 +0300
commit682b09c943da88eed36cb5f181dafec261f03085 (patch)
treed726602acfa65c0adf15995393424e18de3decc2
parent39198413e3ce22e41b915306618953cac0402cad (diff)
parent2793f5ee9be3828995a9f92863ee5d3d01725cac (diff)
downloadrabbitmq-server-git-682b09c943da88eed36cb5f181dafec261f03085.tar.gz
Merge pull request #3033 from rabbitmq/mk-higher-consumer-timeout-default
Bump consumer acknowledgement timeout default to 30 minutes
-rw-r--r--deps/rabbit/Makefile5
-rw-r--r--deps/rabbit/priv/schema/rabbit.schema4
2 files changed, 5 insertions, 4 deletions
diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
index d4105d9e1a..43cb95051d 100644
--- a/deps/rabbit/Makefile
+++ b/deps/rabbit/Makefile
@@ -85,8 +85,9 @@ define PROJECT_ENV
%% see rabbitmq-server#248
%% and rabbitmq-server#667
{channel_operation_timeout, 15000},
- %% 15 minutes
- {consumer_timeout, 900000},
+ %% See https://www.rabbitmq.com/consumers.html#acknowledgement-timeout
+ %% 30 minutes
+ {consumer_timeout, 1800000},
%% see rabbitmq-server#486
{autocluster,
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
index 28d85220c9..1a0168f7b6 100644
--- a/deps/rabbit/priv/schema/rabbit.schema
+++ b/deps/rabbit/priv/schema/rabbit.schema
@@ -1152,9 +1152,9 @@ end}.
[{datatype, {enum, [stop_node, continue, transient, persistent]}}]}.
%% Approximate maximum time a consumer can spend processing a message before
-%% the channel is terminated, in milliseconds. Default is no timeout.
+%% the channel is terminated, in milliseconds.
%%
-%% {consumer_timeout, 10000},
+%% {consumer_timeout, 1800000},
{mapping, "consumer_timeout", "rabbit.consumer_timeout", [
{datatype, integer},