You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/03/13 08:00:27 UTC

[1/3] storm git commit: STORM-2403 Fix KafkaBolt test failure: tick tuple should not be acked

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 23ebe9033 -> 190a1dff2


STORM-2403 Fix KafkaBolt test failure: tick tuple should not be acked

* This bug is introduced from STORM-2387


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/635c819d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/635c819d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/635c819d

Branch: refs/heads/1.0.x-branch
Commit: 635c819d4bdf424e269688044c69cfab31787255
Parents: 23ebe90
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Mar 10 01:15:15 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 16:59:57 2017 +0900

----------------------------------------------------------------------
 .../src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/635c819d/external/storm-kafka/src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java b/external/storm-kafka/src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java
index 180828e..8aa2d0b 100644
--- a/external/storm-kafka/src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java
+++ b/external/storm-kafka/src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java
@@ -97,7 +97,7 @@ public class KafkaBoltTest {
     }
 
     @Test
-    public void shouldAcknowledgeTickTuples() throws Exception {
+    public void shouldNotAcknowledgeTickTuples() throws Exception {
         // Given
         Tuple tickTuple = mockTickTuple();
 
@@ -105,7 +105,7 @@ public class KafkaBoltTest {
         bolt.execute(tickTuple);
 
         // Then
-        verify(collector).ack(tickTuple);
+        verify(collector, never()).ack(tickTuple);
     }
 
     @Test


[2/3] storm git commit: Merge branch 'STORM-2403-1.0.x-merge' into 1.0.x-branch

Posted by ka...@apache.org.
Merge branch 'STORM-2403-1.0.x-merge' into 1.0.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2da2b7e5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2da2b7e5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2da2b7e5

Branch: refs/heads/1.0.x-branch
Commit: 2da2b7e52b35dbc3faf8fed0ef237d49f8e525fd
Parents: 23ebe90 635c819
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Mar 13 17:00:03 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 17:00:03 2017 +0900

----------------------------------------------------------------------
 .../src/test/org/apache/storm/kafka/bolt/KafkaBoltTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[3/3] storm git commit: STORM-2403: CHANGELOG

Posted by ka...@apache.org.
STORM-2403: CHANGELOG


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/190a1dff
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/190a1dff
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/190a1dff

Branch: refs/heads/1.0.x-branch
Commit: 190a1dff24f68dd2d2f725e22bfed16d1e30fdad
Parents: 2da2b7e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Mar 13 17:00:16 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 17:00:16 2017 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/190a1dff/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3e621b..0aeda81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 \ufeff## 1.0.4
+ * STORM-2403: Fix KafkaBolt test failure: tick tuple should not be acked
  * STORM-2361: Kafka spout - after leader change, it stops committing offsets to ZK
  * STORM-2296: Kafka spout - no duplicates on leader changes
  * STORM-2387: Handle tick tuples properly for Bolts in external modules