KAFKA-2831; Do not use ZKUtils in ConsumerGroupCommand if `new-cons…

…umer` is used Author: Ismael Juma <[email protected]> Reviewers: Jason Gustafson <[email protected]>, Ashish Singh <[email protected]>, Jun Rao <[email protected]> Closes apache#528 from ijuma/kafka-2831-consumer-group-command-zookeeper-new-consumer
AllenRay · Nov 16, 2015 · 5fc4546 · 5fc4546
1 parent 4a3d244
commit 5fc4546
Show file tree

Hide file tree

Showing 2 changed files with 310 additions and 248 deletions.
diff --git a/core/src/main/scala/kafka/admin/AdminClient.scala b/core/src/main/scala/kafka/admin/AdminClient.scala
@@ -146,11 +146,10 @@ class AdminClient(val time: Time,
     GroupSummary(metadata.state(), metadata.protocolType(), metadata.protocol(), members)
   }
 
-  case class ConsumerSummary(
-                              memberId: String,
-                              clientId: String,
-                              clientHost: String,
-                              assignment: List[TopicPartition])
+  case class ConsumerSummary(memberId: String,
+                             clientId: String,
+                             clientHost: String,
+                             assignment: List[TopicPartition])
 
   def describeConsumerGroup(groupId: String): List[ConsumerSummary] = {
     val group = describeGroup(groupId)
@@ -169,6 +168,11 @@ class AdminClient(val time: Time,
       List.empty
     }
   }
+
+  def close() {
+    client.close()
+  }
+
 }
 
 object AdminClient {
@@ -249,4 +253,4 @@ object AdminClient {
       highLevelClient,
       bootstrapCluster.nodes().asScala.toList)
   }
-}
+}