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 <sri...@gmail.com> Authored: Thu Jun 6 09:30:22 2013 -0700 Committer: Neha Narkhede <nehanarkh...@apache.org> 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
