Repository: kafka Updated Branches: refs/heads/0.8.2 f76013b0b -> c9f930e3f
resolve conflicts Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/c9f930e3 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/c9f930e3 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/c9f930e3 Branch: refs/heads/0.8.2 Commit: c9f930e3fe25e5675e64550c8b396356c5349ca7 Parents: f76013b Author: Wan Wenli <[email protected]> Authored: Fri Jul 15 10:08:48 2016 -0700 Committer: Guozhang Wang <[email protected]> Committed: Fri Jul 15 10:11:29 2016 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/c9f930e3/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala index aef8361..d4e5e24 100644 --- a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala +++ b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala @@ -114,7 +114,7 @@ object VerifyConsumerRebalance extends Logging { // check if the owner is a valid consumer id consumerIdsForTopic match { case Some(consumerIds) => - if(!consumerIds.contains(partitionOwner)) { + if(!consumerIds.map(c => c.toString).contains(partitionOwner)) { error(("Owner %s for partition [%s,%d] is not a valid member of consumer " + "group %s").format(partitionOwner, topic, partition, group)) rebalanceSucceeded = false
