From ad722531daafadbcb27b0c0db0b9fcbb68b25b28 Mon Sep 17 00:00:00 2001 From: Ted Malaska Date: Thu, 2 Apr 2015 18:20:54 -0700 Subject: [PATCH] kafka-2016; RollingBounceTest takes long; patched by Ted Malaska; reviewed by Jun Rao --- .../test/scala/unit/kafka/integration/RollingBounceTest.scala | 1 - core/src/test/scala/unit/kafka/utils/TestUtils.scala | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala b/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala index 4d27e41c727..f74e71615a5 100644 --- a/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala +++ b/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala @@ -40,7 +40,6 @@ class RollingBounceTest extends JUnit3Suite with ZooKeeperTestHarness { val configProps2 = TestUtils.createBrokerConfig(brokerId2, port2) val configProps3 = TestUtils.createBrokerConfig(brokerId3, port3) val configProps4 = TestUtils.createBrokerConfig(brokerId4, port4) - configProps4.put("controlled.shutdown.retry.backoff.ms", "100") var servers: Seq[KafkaServer] = Seq.empty[KafkaServer] diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index 1682a773621..bb4daad42c0 100644 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -167,6 +167,7 @@ object TestUtils extends Logging { props.put("controller.socket.timeout.ms", "1500") props.put("controlled.shutdown.enable", enableControlledShutdown.toString) props.put("delete.topic.enable", enableDeleteTopic.toString) + props.put("controlled.shutdown.retry.backoff.ms", "100") props }