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 C732EC3FC for ; Thu, 11 Jul 2013 06:37:17 +0000 (UTC) Received: (qmail 67066 invoked by uid 500); 11 Jul 2013 06:37:16 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 67009 invoked by uid 500); 11 Jul 2013 06:37:16 -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 65387 invoked by uid 99); 11 Jul 2013 06:37:12 -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, 11 Jul 2013 06:37:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 60D4388F081; Thu, 11 Jul 2013 06:37:12 +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 Date: Thu, 11 Jul 2013 06:37:35 -0000 Message-Id: <25c0c5f21d6b428d91b21ce8d30a65c1@git.apache.org> In-Reply-To: <964622789b444d18b53dd5faa1c76cda@git.apache.org> References: <964622789b444d18b53dd5faa1c76cda@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/40] git commit: KAFKA-935: Fix shutdown tool to work with new controlled shutdown API; reviewed by Neha Narkhede KAFKA-935: Fix shutdown tool to work with new controlled shutdown API; reviewed by Neha Narkhede Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/9b30acee Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/9b30acee Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/9b30acee Branch: refs/heads/trunk Commit: 9b30aceea3996853b95464d29a2582dbc173d2ac Parents: 9bd2a11 Author: Sriram Subramanian Authored: Thu Jun 6 09:30:22 2013 -0700 Committer: Neha Narkhede Committed: Thu Jun 6 09:30:33 2013 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/admin/ShutdownBroker.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/9b30acee/core/src/main/scala/kafka/admin/ShutdownBroker.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/admin/ShutdownBroker.scala b/core/src/main/scala/kafka/admin/ShutdownBroker.scala index bb20edb..2dd47e7 100644 --- a/core/src/main/scala/kafka/admin/ShutdownBroker.scala +++ b/core/src/main/scala/kafka/admin/ShutdownBroker.scala @@ -25,7 +25,7 @@ import javax.management.remote.{JMXServiceURL, JMXConnectorFactory} import javax.management.ObjectName import kafka.controller.KafkaController import scala.Some -import kafka.common.BrokerNotAvailableException +import kafka.common.{TopicAndPartition, BrokerNotAvailableException} object ShutdownBroker extends Logging { @@ -58,8 +58,8 @@ object ShutdownBroker extends Logging { val leaderPartitionsRemaining = mbsc.invoke(new ObjectName(KafkaController.MBeanName), "shutdownBroker", Array(params.brokerId), - Array(classOf[Int].getName)).asInstanceOf[Int] - val shutdownComplete = (leaderPartitionsRemaining == 0) + Array(classOf[Int].getName)).asInstanceOf[Set[TopicAndPartition]] + val shutdownComplete = (leaderPartitionsRemaining.size == 0) info("Shutdown status: " + (if (shutdownComplete) "complete" else "incomplete (broker still leads %d partitions)".format(leaderPartitionsRemaining))) shutdownComplete