From 6970afc23bfd0f1675828e1098092ea253b1d7a4 Mon Sep 17 00:00:00 2001 From: Manikumar Reddy Date: Tue, 27 Mar 2018 23:33:38 +0530 Subject: [PATCH 1/2] MINOR: Fix ReassignPartitionsClusterTest.testHwAfterPartitionReassignment test --- .../unit/kafka/admin/ReassignPartitionsClusterTest.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala b/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala index 0c41519d2119e..c66094b1fc07f 100644 --- a/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala +++ b/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala @@ -98,7 +98,9 @@ class ReassignPartitionsClusterTest extends ZooKeeperTestHarness with Logging { ) assertEquals(100, newLeaderServer.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset) - servers.foreach(server => waitUntilTrue(() => server.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset == 100, "")) + val replicaServer = servers.find(_.config.brokerId == 102).get + TestUtils.waitUntilTrue(() => replicaServer.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset == 100, + "partition follower's highWatermark should be 100") } From b37ec39762037bb1e1d596e95dc326625ac103d4 Mon Sep 17 00:00:00 2001 From: Manikumar Reddy Date: Tue, 27 Mar 2018 23:50:05 +0530 Subject: [PATCH 2/2] Address review comment --- .../unit/kafka/admin/ReassignPartitionsClusterTest.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala b/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala index c66094b1fc07f..b42d7f7c9f9a4 100644 --- a/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala +++ b/core/src/test/scala/unit/kafka/admin/ReassignPartitionsClusterTest.scala @@ -98,8 +98,8 @@ class ReassignPartitionsClusterTest extends ZooKeeperTestHarness with Logging { ) assertEquals(100, newLeaderServer.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset) - val replicaServer = servers.find(_.config.brokerId == 102).get - TestUtils.waitUntilTrue(() => replicaServer.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset == 100, + val newFollowerServer = servers.find(_.config.brokerId == 102).get + TestUtils.waitUntilTrue(() => newFollowerServer.replicaManager.getReplicaOrException(topicPartition).highWatermark.messageOffset == 100, "partition follower's highWatermark should be 100") }