You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ma...@apache.org on 2014/06/05 22:26:21 UTC
git commit: SAMZA-224. Fix race condition in TestStatefulTask
Repository: incubator-samza
Updated Branches:
refs/heads/master 39592d49a -> 409ced1f6
SAMZA-224. Fix race condition in TestStatefulTask
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/409ced1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/409ced1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/409ced1f
Branch: refs/heads/master
Commit: 409ced1f6f4bce134d6136195ba6b611d6c2f206
Parents: 39592d4
Author: Martin Kleppmann <mk...@linkedin.com>
Authored: Thu Jun 5 20:42:31 2014 +0100
Committer: Martin Kleppmann <mk...@linkedin.com>
Committed: Thu Jun 5 20:42:31 2014 +0100
----------------------------------------------------------------------
.../org/apache/samza/test/integration/TestStatefulTask.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/409ced1f/samza-test/src/test/scala/org/apache/samza/test/integration/TestStatefulTask.scala
----------------------------------------------------------------------
diff --git a/samza-test/src/test/scala/org/apache/samza/test/integration/TestStatefulTask.scala b/samza-test/src/test/scala/org/apache/samza/test/integration/TestStatefulTask.scala
index 10502a9..dc44a99 100644
--- a/samza-test/src/test/scala/org/apache/samza/test/integration/TestStatefulTask.scala
+++ b/samza-test/src/test/scala/org/apache/samza/test/integration/TestStatefulTask.scala
@@ -214,13 +214,13 @@ class TestStatefulTask {
"stores.mystore.msg.serde" -> "string",
"stores.mystore.changelog" -> "kafka.mystore",
- // Use smallest reset for input streams, so we can fix SAMZA-166.
"systems.kafka.samza.factory" -> "org.apache.samza.system.kafka.KafkaSystemFactory",
- "systems.kafka.samza.offset.default" -> "oldest",
+ // Always start consuming at offset 0. This avoids a race condition between
+ // the producer and the consumer in this test (SAMZA-166, SAMZA-224).
+ "systems.kafka.samza.offset.default" -> "oldest", // applies to a nonempty topic
+ "systems.kafka.consumer.auto.offset.reset" -> "smallest", // applies to an empty topic
"systems.kafka.samza.msg.serde" -> "string",
"systems.kafka.consumer.zookeeper.connect" -> zkConnect,
- // Use largest offset for reset, so we can test SAMZA-142.
- "systems.kafka.consumer.auto.offset.reset" -> "largest",
"systems.kafka.producer.metadata.broker.list" -> ("localhost:%s" format port1))
@Test