You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/11 18:06:43 UTC
[1/4] storm git commit: Tick tuples must be acked like normal tuples
Repository: storm
Updated Branches:
refs/heads/master 58af76601 -> f256eec08
Tick tuples must be acked like normal tuples
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5edd4eae
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5edd4eae
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5edd4eae
Branch: refs/heads/master
Commit: 5edd4eaea7bb6e6be65e9d6bffaeaa897551df71
Parents: b7ba063
Author: Xin Wang <be...@163.com>
Authored: Tue Dec 29 10:05:02 2015 +0800
Committer: vesense <be...@163.com>
Committed: Tue Dec 29 12:17:33 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java | 1 +
.../java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 7 +++++++
.../java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 1 +
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 1 +
4 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5edd4eae/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
index ea17b2c..c215b2d 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
@@ -96,6 +96,7 @@ public class HBaseBolt extends AbstractHBaseBolt {
try {
if (TupleUtils.isTick(tuple)) {
LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + batchSize + "]");
+ collector.ack(tuple);
flush = true;
} else {
byte[] rowKey = this.mapper.rowKey(tuple);
http://git-wip-us.apache.org/repos/asf/storm/blob/5edd4eae/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java
index fd32f50..36e5606 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java
@@ -20,7 +20,10 @@ package org.apache.storm.hbase.bolt;
import backtype.storm.topology.OutputFieldsDeclarer;
import backtype.storm.tuple.Tuple;
import backtype.storm.tuple.Values;
+import backtype.storm.utils.TupleUtils;
+
import com.google.common.collect.Lists;
+
import org.apache.commons.lang.Validate;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
@@ -61,6 +64,10 @@ public class HBaseLookupBolt extends AbstractHBaseBolt {
@Override
public void execute(Tuple tuple) {
+ if (TupleUtils.isTick(tuple)) {
+ collector.ack(tuple);
+ return;
+ }
byte[] rowKey = this.mapper.rowKey(tuple);
Get get = hBaseClient.constructGetRequests(rowKey, projectionCriteria);
http://git-wip-us.apache.org/repos/asf/storm/blob/5edd4eae/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
index 1108fbb..3c3d54b 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
@@ -151,6 +151,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
boolean forceSync = false;
if (TupleUtils.isTick(tuple)) {
LOG.debug("TICK! forcing a file system flush");
+ this.collector.ack(tuple);
forceSync = true;
} else {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/5edd4eae/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index d8685b0..73ad605 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -113,6 +113,7 @@ public class HiveBolt extends BaseRichBolt {
boolean forceFlush = false;
if (TupleUtils.isTick(tuple)) {
LOG.debug("TICK received! current batch status [" + tupleBatch.size() + "/" + options.getBatchSize() + "]");
+ collector.ack(tuple);
forceFlush = true;
}
else {
[2/4] storm git commit: fix unit test
Posted by bo...@apache.org.
fix unit test
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e621269
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e621269
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e621269
Branch: refs/heads/master
Commit: 6e621269ff5023c84e4efab30b0ab0c3ebe443f9
Parents: 5edd4ea
Author: Xin Wang <be...@163.com>
Authored: Tue Dec 29 11:20:47 2015 +0800
Committer: vesense <be...@163.com>
Committed: Tue Dec 29 12:17:40 2015 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6e621269/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java
index 8e79c8c..159beda 100644
--- a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java
+++ b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java
@@ -380,10 +380,10 @@ public class TestHiveBolt {
bolt = new HiveBolt(hiveOptions);
bolt.prepare(config, null, new OutputCollector(collector));
- //The tick should NOT cause any acks since the batch was empty
+ //The tick should NOT cause any acks since the batch was empty except for acking itself
Tuple mockTick = MockTupleHelpers.mockTickTuple();
bolt.execute(mockTick);
- verifyZeroInteractions(collector);
+ verify(collector).ack(mockTick);
bolt.cleanup();
}
[3/4] storm git commit: Merge branch 'ack-tick-tuples' of
https://github.com/vesense/storm into STORM-1425
Posted by bo...@apache.org.
Merge branch 'ack-tick-tuples' of https://github.com/vesense/storm into STORM-1425
STORM-1425: Tick tuples should be acked like normal tuples
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec8739ed
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec8739ed
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec8739ed
Branch: refs/heads/master
Commit: ec8739edbccecf125b012f35dbdd90c3e5439103
Parents: 58af766 6e62126
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 11:03:43 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 11:03:43 2016 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java | 1 +
.../java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 7 +++++++
.../java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 1 +
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 1 +
.../test/java/org/apache/storm/hive/bolt/TestHiveBolt.java | 4 ++--
5 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/4] storm git commit: Added STORM-1425 to changelog
Posted by bo...@apache.org.
Added STORM-1425 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f256eec0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f256eec0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f256eec0
Branch: refs/heads/master
Commit: f256eec08575e66a98ef86feef53e88adb637e90
Parents: ec8739e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 11:04:24 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 11:04:24 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f256eec0/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 636d54f..7ef52b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1425: Tick tuples should be acked like normal tuples
* STORM-1432: Spurious failure in storm-kafka test
* STORM-1449: Fix Kafka spout to maintain backward compatibility
* STORM-1458: Add check to see if nimbus is already running.