You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/03/08 18:31:56 UTC
[1/2] storm git commit: STORM-693: when bolt fails to write tuple,
it should report error instead of silently acking.
Repository: storm
Updated Branches:
refs/heads/master 07098e8eb -> 9f57ba9bb
STORM-693: when bolt fails to write tuple, it should report error instead of silently acking.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aadccb4c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aadccb4c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aadccb4c
Branch: refs/heads/master
Commit: aadccb4cb2a6602651d31542ecf2c96d72a0edfa
Parents: 559f0f2
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Mon Mar 2 16:06:58 2015 -0800
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Mon Mar 2 16:06:58 2015 -0800
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java | 7 +++----
.../storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aadccb4c/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java b/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
index b6c3de4..cf169dc 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java
@@ -101,11 +101,10 @@ public class KafkaBolt<K, V> extends BaseRichBolt {
} else {
LOG.warn("skipping key = " + key + ", topic selector returned null.");
}
- } catch (Exception ex) {
- LOG.error("Could not send message with key = " + key
- + " and value = " + message + " to topic = " + topic, ex);
- } finally {
collector.ack(input);
+ } catch (Exception ex) {
+ collector.reportError(ex);
+ collector.fail(input);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/aadccb4c/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
index 2a56f84..c30cba1 100644
--- a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
@@ -143,7 +143,7 @@ public class KafkaBoltTest {
String message = "value-234";
Tuple tuple = generateTestTuple(message);
bolt.execute(tuple);
- verify(collector).ack(tuple);
+ verify(collector).fail(tuple);
}
[2/2] storm git commit: Merge branch 'STORM-693' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-693
Posted by sr...@apache.org.
Merge branch 'STORM-693' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-693
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f57ba9b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f57ba9b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f57ba9b
Branch: refs/heads/master
Commit: 9f57ba9bb8da9781d4091403479864886e261c2b
Parents: 07098e8 aadccb4
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Mar 8 10:21:53 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Mar 8 10:21:53 2015 -0700
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/bolt/KafkaBolt.java | 7 +++----
.../storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------