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 21:04:28 UTC
[1/5] storm git commit: Log "task is null" instead of let worker died
Repository: storm
Updated Branches:
refs/heads/master 106af613f -> 59895a71f
Log "task is null" instead of let worker died
* when task is null in transfer-fn, creating TaskMessage leads NPE
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14477f44
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14477f44
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14477f44
Branch: refs/heads/master
Commit: 14477f4412f4adfaf42367e8a697e1a17b7dfb8e
Parents: a7c8310
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 17 14:09:39 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 17 14:09:39 2015 +0900
----------------------------------------------------------------------
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/14477f44/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 978ea16..c4afcd9 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -133,8 +133,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 null. tuple information: " tuple))
+ ))))
(local-transfer local)
(disruptor/publish transfer-queue remoteMap)
))]
[5/5] 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/59895a71
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/59895a71
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/59895a71
Branch: refs/heads/master
Commit: 59895a71f3401da9f8b52efcb7927a459bb52883
Parents: dc8dea6
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 28 15:04:16 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 28 15:04:16 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/59895a71/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e30f440..9933057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn
* STORM-596: remove config topology.receiver.buffer.size
* STORM-808: allow null to be parsed as null
* STORM-816: maven-gpg-plugin does not work with gpg 2.1
[4/5] storm git commit: Merge branch 'STORM-790' of
github.com:HeartSaVioR/storm
Posted by pt...@apache.org.
Merge branch 'STORM-790' of github.com:HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dc8dea61
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc8dea61
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc8dea61
Branch: refs/heads/master
Commit: dc8dea61be46a45287cfb6aeed5d5675aa3a96ae
Parents: 106af61 6f62a4e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 28 15:02:49 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 28 15:02:49 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/dc8dea61/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
[2/5] storm git commit: Also leave tuple type to log when task is null
Posted by pt...@apache.org.
Also leave tuple type to log when task is null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/700c8ed1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/700c8ed1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/700c8ed1
Branch: refs/heads/master
Commit: 700c8ed166623d54d5dfa1aa57fc50ae522aaf93
Parents: 14477f4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Apr 23 08:42:35 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Apr 23 08:42:35 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/700c8ed1/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 c4afcd9..0fddef5 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -135,7 +135,7 @@
(let [remote (.get remoteMap node+port)]
(if (not-nil? task)
(.add remote (TaskMessage. task (.serialize serializer tuple)))
- (log-warn "Can't transfer tuple - task value is null. tuple information: " tuple))
+ (log-warn "Can't transfer tuple - task value is null. tuple type: " (type tuple) " and information: " tuple))
))))
(local-transfer local)
(disruptor/publish transfer-queue remoteMap)
[3/5] storm git commit: fix log presentation: (str nil) is empty
string, (pr-str nil) is "nil"
Posted by pt...@apache.org.
fix log presentation: (str nil) is empty string, (pr-str nil) is "nil"
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6f62a4e6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6f62a4e6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6f62a4e6
Branch: refs/heads/master
Commit: 6f62a4e61e1f6d3f2d41d068b78b8e859c751338
Parents: 700c8ed
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Apr 25 23:50:46 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Apr 25 23:50:46 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6f62a4e6/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 0fddef5..a83146b 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -135,7 +135,7 @@
(let [remote (.get remoteMap node+port)]
(if (not-nil? task)
(.add remote (TaskMessage. task (.serialize serializer tuple)))
- (log-warn "Can't transfer tuple - task value is null. tuple type: " (type tuple) " and information: " 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)