[incubator-pulsar] branch branch-2.1 updated: Increased default brokerShutdownTimeout to 60 seconds (#2377)

[sijie]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new caf8d67  Increased default brokerShutdownTimeout to 60 seconds (#2377)
caf8d67 is described below

commit caf8d676f0a49896269b57032bd07ae3b4287564
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Wed Aug 15 11:50:18 2018 -0700

    Increased default brokerShutdownTimeout to 60 seconds (#2377)
    
     ### Motivation
    
    The default timeout for broker graceful shutdown is set to 3 seconds. This 
can give little room to do graceful shutdown when the broker is serving a lot 
of topics.
    
    There is no big downside in increasing the timeout to a much bigger value.
---
 conf/broker.conf                                                        | 2 +-
 conf/standalone.conf                                                    | 2 +-
 deployment/terraform-ansible/templates/broker.conf                      | 2 +-
 .../src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/broker.conf b/conf/broker.conf
index 2e40d82..cd4a505 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -53,7 +53,7 @@ failureDomainsEnabled=false
 zooKeeperSessionTimeoutMillis=30000
 
 # Time to wait for broker graceful shutdown. After this time elapses, the 
process will be killed
-brokerShutdownTimeoutMs=3000
+brokerShutdownTimeoutMs=60000
 
 # Enable backlog quota check. Enforces action on topic when the quota is 
reached
 backlogQuotaCheckEnabled=true
diff --git a/conf/standalone.conf b/conf/standalone.conf
index 0d7a395..cc03b95 100644
--- a/conf/standalone.conf
+++ b/conf/standalone.conf
@@ -46,7 +46,7 @@ failureDomainsEnabled=false
 zooKeeperSessionTimeoutMillis=30000
 
 # Time to wait for broker graceful shutdown. After this time elapses, the 
process will be killed
-brokerShutdownTimeoutMs=3000
+brokerShutdownTimeoutMs=60000
 
 # Enable backlog quota check. Enforces action on topic when the quota is 
reached
 backlogQuotaCheckEnabled=true
diff --git a/deployment/terraform-ansible/templates/broker.conf 
b/deployment/terraform-ansible/templates/broker.conf
index 73d4e2f..a7456a4 100644
--- a/deployment/terraform-ansible/templates/broker.conf
+++ b/deployment/terraform-ansible/templates/broker.conf
@@ -53,7 +53,7 @@ failureDomainsEnabled=false
 zooKeeperSessionTimeoutMillis=30000
 
 # Time to wait for broker graceful shutdown. After this time elapses, the 
process will be killed
-brokerShutdownTimeoutMs=3000
+brokerShutdownTimeoutMs=60000
 
 # Enable backlog quota check. Enforces action on topic when the quota is 
reached
 backlogQuotaCheckEnabled=true
diff --git 
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
 
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 1bb6fff..ddc7728 100644
--- 
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ 
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -78,7 +78,7 @@ public class ServiceConfiguration implements 
PulsarConfiguration {
     // Time to wait for broker graceful shutdown. After this time elapses, the
     // process will be killed
     @FieldContext(dynamic = true)
-    private long brokerShutdownTimeoutMs = 3000;
+    private long brokerShutdownTimeoutMs = 60000;
     // Enable backlog quota check. Enforces action on topic when the quota is
     // reached
     private boolean backlogQuotaCheckEnabled = true;