From 52e9d571bf021aadb211a86b711130fccba02e15 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Sun, 12 Oct 2014 16:41:15 -0700 Subject: [PATCH] KAFKA-1305. Controller can hang on controlled shutdown with auto leader balance enabled. --- core/src/main/scala/kafka/controller/ControllerChannelManager.scala | 2 +- core/src/main/scala/kafka/server/KafkaConfig.scala | 3 --- system_test/mirror_maker_testsuite/config/server.properties | 1 - system_test/offset_management_testsuite/config/server.properties | 1 - .../testcase_7002/config/kafka_server_1.properties | 1 - .../testcase_7002/config/kafka_server_2.properties | 1 - .../testcase_7002/config/kafka_server_3.properties | 1 - .../testcase_7002/config/kafka_server_4.properties | 1 - system_test/replication_testsuite/config/server.properties | 1 - 9 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala index ecbfa0f..2c41114 100644 --- a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala +++ b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala @@ -78,7 +78,7 @@ class ControllerChannelManager (private val controllerContext: ControllerContext } private def addNewBroker(broker: Broker) { - val messageQueue = new LinkedBlockingQueue[(RequestOrResponse, (RequestOrResponse) => Unit)](config.controllerMessageQueueSize) + val messageQueue = new LinkedBlockingQueue[(RequestOrResponse, (RequestOrResponse) => Unit)]() debug("Controller %d trying to connect to broker %d".format(config.brokerId,broker.id)) val channel = new BlockingChannel(broker.host, broker.port, BlockingChannel.UseDefaultBufferSize, diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index 90af698..d01eb1c 100644 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -209,9 +209,6 @@ class KafkaConfig private (val props: VerifiableProperties) extends ZKConfig(pro /* the socket timeout for controller-to-broker channels */ 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) - /* default replication factors for automatically created topics */ val defaultReplicationFactor = props.getInt("default.replication.factor", 1) diff --git a/system_test/mirror_maker_testsuite/config/server.properties b/system_test/mirror_maker_testsuite/config/server.properties index c628412..9717cd6 100644 --- a/system_test/mirror_maker_testsuite/config/server.properties +++ b/system_test/mirror_maker_testsuite/config/server.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=1 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/offset_management_testsuite/config/server.properties b/system_test/offset_management_testsuite/config/server.properties index 2b988f8..b6de528 100644 --- a/system_test/offset_management_testsuite/config/server.properties +++ b/system_test/offset_management_testsuite/config/server.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=1 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_1.properties b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_1.properties index 41ec6e4..9efbd9d 100644 --- a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_1.properties +++ b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_1.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=3 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_2.properties b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_2.properties index 727e237..d4bf702 100644 --- a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_2.properties +++ b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_2.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=3 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_3.properties b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_3.properties index e6fbbe1..e6e06be 100644 --- a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_3.properties +++ b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_3.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=3 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_4.properties b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_4.properties index fee65bc..2cb03e4 100644 --- a/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_4.properties +++ b/system_test/offset_management_testsuite/testcase_7002/config/kafka_server_4.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=3 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 diff --git a/system_test/replication_testsuite/config/server.properties b/system_test/replication_testsuite/config/server.properties index 6becbab..d1dff68 100644 --- a/system_test/replication_testsuite/config/server.properties +++ b/system_test/replication_testsuite/config/server.properties @@ -128,7 +128,6 @@ log.index.size.max.bytes=10485760 log.index.interval.bytes=4096 auto.create.topics.enable=true controller.socket.timeout.ms=30000 -controller.message.queue.size=10 default.replication.factor=1 replica.lag.time.max.ms=10000 replica.lag.max.messages=4000 -- 1.8.5.2 (Apple Git-48)