You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2017/05/05 04:12:13 UTC

kafka git commit: KAFKA-5137; Controlled shutdown timeout message improvement

Repository: kafka
Updated Branches:
  refs/heads/trunk 124ddf577 -> 2448343ed


KAFKA-5137; Controlled shutdown timeout message improvement

Provide correct config details in the log message.

Author: umesh chaudhary <um...@gmail.com>

Reviewers: Dustin Cote <du...@confluent.io>, Ismael Juma <is...@juma.me.uk>

Closes #2932 from umesh9794/local


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/2448343e
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/2448343e
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/2448343e

Branch: refs/heads/trunk
Commit: 2448343edd0ea2e1f1a4cdc325d361913e48ff14
Parents: 124ddf5
Author: umesh chaudhary <um...@gmail.com>
Authored: Fri May 5 05:11:43 2017 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Fri May 5 05:11:47 2017 +0100

----------------------------------------------------------------------
 core/src/main/scala/kafka/server/KafkaServer.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/2448343e/core/src/main/scala/kafka/server/KafkaServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala
index 19773dc..3c681e4 100755
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -458,7 +458,7 @@ class KafkaServer(val config: KafkaConfig, time: Time = Time.SYSTEM, threadNameP
             catch {
               case ioe: IOException =>
                 ioException = true
-                warn("Error during controlled shutdown, possibly because leader movement took longer than the configured socket.timeout.ms: %s".format(ioe.getMessage))
+                warn("Error during controlled shutdown, possibly because leader movement took longer than the configured controller.socket.timeout.ms and/or request.timeout.ms: %s".format(ioe.getMessage))
                 // ignore and try again
             }
           }
@@ -532,7 +532,7 @@ class KafkaServer(val config: KafkaConfig, time: Time = Time.SYSTEM, threadNameP
               case ioe: java.io.IOException =>
                 channel.disconnect()
                 channel = null
-                warn("Error during controlled shutdown, possibly because leader movement took longer than the configured socket.timeout.ms: %s".format(ioe.getMessage))
+                warn("Error during controlled shutdown, possibly because leader movement took longer than the configured controller.socket.timeout.ms and/or request.timeout.ms: %s".format(ioe.getMessage))
                 // ignore and try again
             }
           }