Repository: kafka Updated Branches: refs/heads/0.8.2 da2c7cd50 -> 133a4fb75
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/133a4fb7 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/133a4fb7 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/133a4fb7 Branch: refs/heads/0.8.2 Commit: 133a4fb752810ad8b5ea7b63fa15f594428c5cf6 Parents: da2c7cd Author: Sriharsha Chintalapani <[email protected]> Authored: Mon Oct 13 12:31:21 2014 -0700 Committer: Neha Narkhede <[email protected]> Committed: Mon Oct 13 12:31:27 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/133a4fb7/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 165c816..cb87d3d 100644 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -205,7 +205,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) @@ -251,7 +251,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. */
