From d9750d63a58934aaffa65a3ebe2cb66cd06d12b4 Mon Sep 17 00:00:00 2001 From: jeanlyn Date: Wed, 16 Dec 2015 15:05:35 +0800 Subject: [PATCH 1/2] fix delete topic incompletion --- app/kafka/manager/KafkaCommandActor.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/app/kafka/manager/KafkaCommandActor.scala b/app/kafka/manager/KafkaCommandActor.scala index 9926a83fa..7398ca09e 100644 --- a/app/kafka/manager/KafkaCommandActor.scala +++ b/app/kafka/manager/KafkaCommandActor.scala @@ -73,7 +73,6 @@ class KafkaCommandActor(kafkaCommandActorConfig: KafkaCommandActorConfig) extend Future { KCCommandResult(Try { kafkaCommandActorConfig.adminUtils.deleteTopic(kafkaCommandActorConfig.curator, topic) //this should work in 0.8.2 - kafkaCommandActorConfig.curator.delete().deletingChildrenIfNeeded().forPath(ZkUtils.getTopicPath(topic)) }) } } From e782b8021094ce48ceebe09aa8f9ca97629e5e25 Mon Sep 17 00:00:00 2001 From: jeanlyn Date: Thu, 17 Dec 2015 09:06:11 +0800 Subject: [PATCH 2/2] fix test error --- test/kafka/manager/TestClusterManagerActor.scala | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/kafka/manager/TestClusterManagerActor.scala b/test/kafka/manager/TestClusterManagerActor.scala index cae075a18..7cdcd72af 100644 --- a/test/kafka/manager/TestClusterManagerActor.scala +++ b/test/kafka/manager/TestClusterManagerActor.scala @@ -238,10 +238,6 @@ class TestClusterManagerActor extends CuratorAwareTest { cmResult.result.get } } - Thread.sleep(3000) - withClusterManagerActor(KSGetTopics) { result: TopicList => - assert(!result.list.contains(createTopicName),"Failed to delete topic") - } } test("create logkafka") {