You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/23 20:57:55 UTC

[1/2] git commit: trident DRPC bug fix.

Repository: incubator-storm
Updated Branches:
  refs/heads/master 7429e1d16 -> a5130af70


trident DRPC bug fix.

ack/fail will not remove FinishCondition due to unknown batchId for each
DRPC invocation. It makes the HashMap "_finishConditions" size
increasing. This patch fix the bug.


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

Branch: refs/heads/master
Commit: bf73a0064c4581f615d46e1246e2178d4819afb8
Parents: 6a08855
Author: davidlgr <da...@163.com>
Authored: Wed Apr 23 13:47:51 2014 +0800
Committer: davidlgr <da...@163.com>
Committed: Wed Apr 23 13:47:51 2014 +0800

----------------------------------------------------------------------
 storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bf73a006/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java b/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java
index f5d37e6..728d51e 100644
--- a/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java
+++ b/storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java
@@ -158,6 +158,7 @@ public class RichSpoutBatchTriggerer implements IRichSpout {
                 long r = _rand.nextLong();
                 _collector.emitDirect(t, _coordStream, new Values(batchId, count), r);
                 finish.vals.add(r);
+                _msgIdToBatchId.put(r, batchIdVal);
             }
             _finishConditions.put(batchIdVal, finish);
             return tasks;


[2/2] git commit: Merge branch 'master' of github.com:davidlgr/incubator-storm

Posted by pt...@apache.org.
Merge branch 'master' of github.com:davidlgr/incubator-storm


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

Branch: refs/heads/master
Commit: a5130af709c2a1979c8d376a4d1194f6450eb0d2
Parents: 7429e1d bf73a00
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 23 14:48:45 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 23 14:48:45 2014 -0400

----------------------------------------------------------------------
 storm-core/src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------