From commits-return-1952-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Thu Oct 9 21:51:19 2014 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 76944172A5 for ; Thu, 9 Oct 2014 21:51:19 +0000 (UTC) Received: (qmail 78422 invoked by uid 500); 9 Oct 2014 21:51:19 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 78392 invoked by uid 500); 9 Oct 2014 21:51:19 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 78381 invoked by uid 99); 9 Oct 2014 21:51:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2014 21:51:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0AF3CD9D8; Thu, 9 Oct 2014 21:51:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: junrao@apache.org To: commits@kafka.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: kafka-1558; AdminUtils.deleteTopic does not work; patched by Sriharsha Chintalapani; reviewed by Jun Rao Date: Thu, 9 Oct 2014 21:51:19 +0000 (UTC) Repository: kafka Updated Branches: refs/heads/trunk a7e49298b -> a314461fa kafka-1558; AdminUtils.deleteTopic does not work; patched by Sriharsha Chintalapani; 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/a314461f Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a314461f Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a314461f Branch: refs/heads/trunk Commit: a314461fa04b3249608607d1040c8e0cf8724bac Parents: a7e4929 Author: Sriharsha Chintalapani Authored: Thu Oct 9 14:51:08 2014 -0700 Committer: Jun Rao Committed: Thu Oct 9 14:51:08 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/controller/KafkaController.scala | 3 +-- core/src/main/scala/kafka/controller/PartitionStateMachine.scala | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/a314461f/core/src/main/scala/kafka/controller/KafkaController.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/controller/KafkaController.scala b/core/src/main/scala/kafka/controller/KafkaController.scala index 8ab4a1b..381c52f 100644 --- a/core/src/main/scala/kafka/controller/KafkaController.scala +++ b/core/src/main/scala/kafka/controller/KafkaController.scala @@ -1300,8 +1300,7 @@ class PreferredReplicaElectionListener(controller: KafkaController) extends IZkD error("Skipping preferred replica election for partitions %s since the respective topics are being deleted" .format(partitionsForTopicsToBeDeleted)) } - else - controller.onPreferredReplicaElection(partitions -- partitionsForTopicsToBeDeleted) + controller.onPreferredReplicaElection(partitions -- partitionsForTopicsToBeDeleted) } } http://git-wip-us.apache.org/repos/asf/kafka/blob/a314461f/core/src/main/scala/kafka/controller/PartitionStateMachine.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/controller/PartitionStateMachine.scala b/core/src/main/scala/kafka/controller/PartitionStateMachine.scala index e20b63a..2f0694b 100644 --- a/core/src/main/scala/kafka/controller/PartitionStateMachine.scala +++ b/core/src/main/scala/kafka/controller/PartitionStateMachine.scala @@ -484,8 +484,6 @@ class PartitionStateMachine(controller: KafkaController) extends Logging { topicsToBeDeleted --= nonExistentTopics if(topicsToBeDeleted.size > 0) { info("Starting topic deletion for topics " + topicsToBeDeleted.mkString(",")) - // add topic to deletion list - controller.deleteTopicManager.enqueueTopicsForDeletion(topicsToBeDeleted) // mark topic ineligible for deletion if other state changes are in progress topicsToBeDeleted.foreach { topic => val preferredReplicaElectionInProgress = @@ -495,6 +493,8 @@ class PartitionStateMachine(controller: KafkaController) extends Logging { if(preferredReplicaElectionInProgress || partitionReassignmentInProgress) controller.deleteTopicManager.markTopicIneligibleForDeletion(Set(topic)) } + // add topic to deletion list + controller.deleteTopicManager.enqueueTopicsForDeletion(topicsToBeDeleted) } } }