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 2015/05/28 23:02:06 UTC
[1/2] storm git commit: apply fix for STORM-790
Repository: storm
Updated Branches:
refs/heads/0.9.x-branch 97de0853f -> 0eb514dcd
apply fix for STORM-790
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2c6b9713
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2c6b9713
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2c6b9713
Branch: refs/heads/0.9.x-branch
Commit: 2c6b97133103ec6eb919219b0422a255e832c76d
Parents: 97de085
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 28 17:00:39 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 28 17:00:39 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/worker.clj | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2c6b9713/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index d4c9467..d5569a7 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -126,8 +126,10 @@
(when (not (.get remoteMap node+port))
(.put remoteMap node+port (ArrayList.)))
(let [remote (.get remoteMap node+port)]
- (.add remote (TaskMessage. task (.serialize serializer tuple)))
- ))))
+ (if (not-nil? task)
+ (.add remote (TaskMessage. task (.serialize serializer tuple)))
+ (log-warn "Can't transfer tuple - task value is nil. tuple type: " (pr-str (type tuple)) " and information: " (pr-str tuple)))
+ ))))
(local-transfer local)
(disruptor/publish transfer-queue remoteMap)
[2/2] storm git commit: add STORM-790 to changelog
Posted by pt...@apache.org.
add STORM-790 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0eb514dc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0eb514dc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0eb514dc
Branch: refs/heads/0.9.x-branch
Commit: 0eb514dcd8a5804e7155aae377e479d323a92ec6
Parents: 2c6b971
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 28 17:01:44 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 28 17:01:44 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0eb514dc/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f86558d..6b72a34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.5
+ * STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn
* STORM-796: Add support for "error" command in ShellSpout
* STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'