KAFKA-3636; Change default max session timeout to 5 minutes

Author: Jason Gustafson <[email protected]>

Reviewers: Guozhang Wang <[email protected]>, Onur Karaman 
<[email protected]>, Ismael Juma <[email protected]>

Closes #1284 from hachikuji/KAFKA-3636


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

Branch: refs/heads/0.10.0
Commit: fdded2da6e0f57431fc19fd1705bbb6373c1c863
Parents: 3a496f4
Author: Jason Gustafson <[email protected]>
Authored: Thu Apr 28 14:08:10 2016 -0700
Committer: Ismael Juma <[email protected]>
Committed: Thu Apr 28 14:08:10 2016 -0700

----------------------------------------------------------------------
 .../src/main/scala/kafka/server/KafkaConfig.scala | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/fdded2da/core/src/main/scala/kafka/server/KafkaConfig.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala 
b/core/src/main/scala/kafka/server/KafkaConfig.scala
index 5e28bd7..c5da55d 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -130,9 +130,9 @@ object Defaults {
   val ControlledShutdownRetryBackoffMs = 5000
   val ControlledShutdownEnable = true
 
-  /** ********* Consumer coordinator configuration ***********/
-  val ConsumerMinSessionTimeoutMs = 6000
-  val ConsumerMaxSessionTimeoutMs = 30000
+  /** ********* Group coordinator configuration ***********/
+  val GroupMinSessionTimeoutMs = 6000
+  val GroupMaxSessionTimeoutMs = 300000
 
   /** ********* Offset management configuration ***********/
   val OffsetMetadataMaxSize = OffsetConfig.DefaultMaxMetadataSize
@@ -371,7 +371,7 @@ object KafkaConfig {
   val AuthorizerClassNameDoc = "The authorizer class that should be used for 
authorization"
   /** ********* Socket Server Configuration ***********/
   val PortDoc = "DEPRECATED: only used when `listeners` is not set. " +
-  "Use `listeners` instead. \n" + 
+  "Use `listeners` instead. \n" +
   "the port to listen and accept connections on"
   val HostNameDoc = "DEPRECATED: only used when `listeners` is not set. " +
   "Use `listeners` instead. \n" +
@@ -484,8 +484,8 @@ object KafkaConfig {
   val ControlledShutdownRetryBackoffMsDoc = "Before each retry, the system 
needs time to recover from the state that caused the previous failure 
(Controller fail over, replica lag etc). This config determines the amount of 
time to wait before retrying."
   val ControlledShutdownEnableDoc = "Enable controlled shutdown of the server"
   /** ********* Consumer coordinator configuration ***********/
-  val ConsumerMinSessionTimeoutMsDoc = "The minimum allowed session timeout 
for registered consumers. Shorter timeouts leader to quicker failure detection 
at the cost of more frequent consumer heartbeating, which can overwhelm broker 
resources."
-  val ConsumerMaxSessionTimeoutMsDoc = "The maximum allowed session timeout 
for registered consumers. Longer timeouts give consumers more time to process 
messages in between heartbeats at the cost of a longer time to detect failures."
+  val GroupMinSessionTimeoutMsDoc = "The minimum allowed session timeout for 
registered consumers. Shorter timeouts leader to quicker failure detection at 
the cost of more frequent consumer heartbeating, which can overwhelm broker 
resources."
+  val GroupMaxSessionTimeoutMsDoc = "The maximum allowed session timeout for 
registered consumers. Longer timeouts give consumers more time to process 
messages in between heartbeats at the cost of a longer time to detect failures."
   /** ********* Offset management configuration ***********/
   val OffsetMetadataMaxSizeDoc = "The maximum size for a metadata entry 
associated with an offset commit"
   val OffsetsLoadBufferSizeDoc = "Batch size for reading from the offsets 
segments when loading offsets into the cache."
@@ -661,9 +661,9 @@ object KafkaConfig {
       .define(ControlledShutdownRetryBackoffMsProp, LONG, 
Defaults.ControlledShutdownRetryBackoffMs, MEDIUM, 
ControlledShutdownRetryBackoffMsDoc)
       .define(ControlledShutdownEnableProp, BOOLEAN, 
Defaults.ControlledShutdownEnable, MEDIUM, ControlledShutdownEnableDoc)
 
-      /** ********* Consumer coordinator configuration ***********/
-      .define(GroupMinSessionTimeoutMsProp, INT, 
Defaults.ConsumerMinSessionTimeoutMs, MEDIUM, ConsumerMinSessionTimeoutMsDoc)
-      .define(GroupMaxSessionTimeoutMsProp, INT, 
Defaults.ConsumerMaxSessionTimeoutMs, MEDIUM, ConsumerMaxSessionTimeoutMsDoc)
+      /** ********* Group coordinator configuration ***********/
+      .define(GroupMinSessionTimeoutMsProp, INT, 
Defaults.GroupMinSessionTimeoutMs, MEDIUM, GroupMinSessionTimeoutMsDoc)
+      .define(GroupMaxSessionTimeoutMsProp, INT, 
Defaults.GroupMaxSessionTimeoutMs, MEDIUM, GroupMaxSessionTimeoutMsDoc)
 
       /** ********* Offset management configuration ***********/
       .define(OffsetMetadataMaxSizeProp, INT, Defaults.OffsetMetadataMaxSize, 
HIGH, OffsetMetadataMaxSizeDoc)

Reply via email to