You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ne...@apache.org on 2014/10/13 20:36:43 UTC
git commit: KAFKA-1305. Controller can hang on controlled shutdown
with auto leader balance enabled; reviewed by Neha Narkhede and Jun Rao
Repository: kafka
Updated Branches:
refs/heads/trunk 0d65f043f -> be2e8a769
KAFKA-1305. Controller can hang on controlled shutdown with auto leader balance enabled; reviewed by Neha Narkhede and Jun Rao
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/be2e8a76
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/be2e8a76
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/be2e8a76
Branch: refs/heads/trunk
Commit: be2e8a769efe35dc5c360545e6220a9fe652cced
Parents: 0d65f04
Author: Sriharsha Chintalapani <sc...@hortonworks.com>
Authored: Mon Oct 13 11:36:21 2014 -0700
Committer: Neha Narkhede <ne...@gmail.com>
Committed: Mon Oct 13 11:36:29 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/kafka/server/KafkaConfig.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/be2e8a76/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 90af698..7fcbc16 100644
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -210,7 +210,7 @@ class KafkaConfig private (val props: VerifiableProperties) extends ZKConfig(pro
val controllerSocketTimeoutMs = props.getInt("controller.socket.timeout.ms", 30000)
/* the buffer size for controller-to-broker-channels */
- val controllerMessageQueueSize= props.getInt("controller.message.queue.size", 10)
+ val controllerMessageQueueSize= props.getInt("controller.message.queue.size", Int.MaxValue)
/* default replication factors for automatically created topics */
val defaultReplicationFactor = props.getInt("default.replication.factor", 1)
@@ -256,7 +256,7 @@ class KafkaConfig private (val props: VerifiableProperties) extends ZKConfig(pro
/* Enables auto leader balancing. A background thread checks and triggers leader
* balance if required at regular intervals */
- val autoLeaderRebalanceEnable = props.getBoolean("auto.leader.rebalance.enable", false)
+ val autoLeaderRebalanceEnable = props.getBoolean("auto.leader.rebalance.enable", true)
/* the ratio of leader imbalance allowed per broker. The controller would trigger a leader balance if it goes above
* this value per broker. The value is specified in percentage. */