Repository: kafka Updated Branches: refs/heads/trunk 619d78eb5 -> ad722531d
kafka-2016; RollingBounceTest takes long; patched by Ted Malaska; reviewed by Jun Rao Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/ad722531 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/ad722531 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/ad722531 Branch: refs/heads/trunk Commit: ad722531daafadbcb27b0c0db0b9fcbb68b25b28 Parents: 619d78e Author: Ted Malaska <ted.mala...@cloudera.com> Authored: Thu Apr 2 18:20:54 2015 -0700 Committer: Jun Rao <jun...@gmail.com> Committed: Thu Apr 2 18:20:54 2015 -0700 ---------------------------------------------------------------------- core/src/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/ad722531/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala b/core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala index 4d27e41..f74e716 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] http://git-wip-us.apache.org/repos/asf/kafka/blob/ad722531/core/src/test/scala/unit/kafka/utils/TestUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index 1682a77..bb4daad 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 }
