From 2873292de4881dbea54f823ec4224a87bb387388 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Mon, 13 Oct 2014 07:29:28 -0700 Subject: [PATCH] KAFKA-1305. Controller can hang on controlled shutdown with auto leader balance enabled. --- core/src/main/scala/kafka/server/KafkaConfig.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. */ -- 1.8.5.2 (Apple Git-48)