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/04/14 07:12:50 UTC
[1/3] storm git commit: Change emit order && change manual partition
order
Repository: storm
Updated Branches:
refs/heads/master 877dc8c95 -> aca117db7
Change emit order && change manual partition order
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d76ec81e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d76ec81e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d76ec81e
Branch: refs/heads/master
Commit: d76ec81e30a758a18dec93fcc4b628480f02616c
Parents: 877dc8c
Author: liurenjie1024 <li...@gmail.com>
Authored: Mon Jan 23 17:34:37 2017 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 15:51:51 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/storm/kafka/spout/KafkaSpout.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d76ec81e/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index 51cdb38..7a2cc3d 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -336,19 +336,18 @@ public class KafkaSpout<K, V> extends BaseRichSpout {
collector.emit(tuple);
}
} else {
- if (tuple instanceof KafkaTuple) {
- collector.emit(((KafkaTuple) tuple).getStream(), tuple, msgId);
- } else {
- collector.emit(tuple, msgId);
- }
-
emitted.add(msgId);
-
if (isScheduled) { // Was scheduled for retry and re-emitted, so remove from schedule.
retryService.remove(msgId);
} else { //New tuple, hence increment the uncommitted offset counter
numUncommittedOffsets++;
}
+
+ if (tuple instanceof KafkaTuple) {
+ collector.emit(((KafkaTuple) tuple).getStream(), tuple, msgId);
+ } else {
+ collector.emit(tuple, msgId);
+ }
}
LOG.trace("Emitted tuple [{}] for record [{}] with msgId [{}]", tuple, record, msgId);
return true;
[3/3] storm git commit: STORM-2315: CHANGELOG
Posted by ka...@apache.org.
STORM-2315: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aca117db
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aca117db
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aca117db
Branch: refs/heads/master
Commit: aca117db7020f48a6abe27d5ab33a675c9a645f3
Parents: 249260d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 16:12:37 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 16:12:37 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aca117db/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0024e2..948a0ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -233,6 +233,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.1
+ * STORM-2315: New kafka spout can't commit offset when ack is disabled
* STORM-2467: Use explicit charset when decoding from array backed buffer
* STORM-2429: Properly validate supervisor.scheduler.meta
* STORM-2451: windows storm.cmd does not set log4j2 config file correctly by default
[2/3] storm git commit: Merge branch 'STORM-2315-merge'
Posted by ka...@apache.org.
Merge branch 'STORM-2315-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/249260dd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/249260dd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/249260dd
Branch: refs/heads/master
Commit: 249260ddeb9cde23a154535a8df2ce8f8090a661
Parents: 877dc8c d76ec81
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 16:08:31 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 16:08:31 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/storm/kafka/spout/KafkaSpout.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------