kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject git commit: kafka-1378; transient unit test failure in LogRecoveryTest; patched by Jun Rao; reviewed by Neha Narkhede
Date Sat, 12 Apr 2014 20:49:02 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 05612ac44 -> d37ca7f62


kafka-1378; transient unit test failure in LogRecoveryTest; patched by Jun Rao; 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/d37ca7f6
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/d37ca7f6
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/d37ca7f6

Branch: refs/heads/trunk
Commit: d37ca7f627551c9960e2edb8498784bf2487d53e
Parents: 05612ac
Author: Jun Rao <junrao@gmail.com>
Authored: Sat Apr 12 13:48:57 2014 -0700
Committer: Jun Rao <junrao@gmail.com>
Committed: Sat Apr 12 13:48:57 2014 -0700

----------------------------------------------------------------------
 core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/d37ca7f6/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
index db0e58b..4bf0ef6 100644
--- a/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
+++ b/core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
@@ -149,7 +149,7 @@ class LogRecoveryTest extends JUnit3Suite with ZooKeeperTestHarness {
       
     // give some time for follower 1 to record leader HW of 60
     assertTrue("Failed to update highwatermark for follower after 1000 ms", TestUtils.waitUntilTrue(()
=>
-      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 2000))
+      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 5000))
     // shutdown the servers to allow the hw to be checkpointed
     servers.foreach(server => server.shutdown())
     producer.close()
@@ -180,7 +180,7 @@ class LogRecoveryTest extends JUnit3Suite with ZooKeeperTestHarness {
     var hw = 20L
     // give some time for follower 1 to record leader HW of 600
     assertTrue("Failed to update highwatermark for follower after 1000 ms", TestUtils.waitUntilTrue(()
=>
-      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 1000))
+      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 5000))
     // shutdown the servers to allow the hw to be checkpointed
     servers.foreach(server => server.shutdown())
     producer.close()
@@ -215,7 +215,7 @@ class LogRecoveryTest extends JUnit3Suite with ZooKeeperTestHarness {
     
     // allow some time for the follower to get the leader HW
     assertTrue("Failed to update highwatermark for follower after 1000 ms", TestUtils.waitUntilTrue(()
=>
-      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 1000))
+      server2.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 5000))
     // kill the server hosting the preferred replica
     server1.shutdown()
     server2.shutdown()
@@ -240,7 +240,7 @@ class LogRecoveryTest extends JUnit3Suite with ZooKeeperTestHarness {
     
     // allow some time for the follower to get the leader HW
     assertTrue("Failed to update highwatermark for follower after 1000 ms", TestUtils.waitUntilTrue(()
=>
-      server1.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 1000))
+      server1.replicaManager.getReplica(topic, 0).get.highWatermark == hw, 5000))
     // shutdown the servers to allow the hw to be checkpointed
     servers.foreach(server => server.shutdown())
     producer.close()


Mime
View raw message