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/08/04 22:53:28 UTC
[1/2] storm git commit: STORM-2677 consider all sampled tuples which
took greater than 0 ms processing time
Repository: storm
Updated Branches:
refs/heads/1.x-branch 8f79e69cd -> cd4f9175f
STORM-2677 consider all sampled tuples which took greater than 0 ms processing time
* This closes #2251
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2169aed0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2169aed0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2169aed0
Branch: refs/heads/1.x-branch
Commit: 2169aed060614ddcbe59cb333fc11a8fb32620cd
Parents: 8f79e69
Author: vinodkc <vi...@gmail.com>
Authored: Tue Aug 1 11:47:50 2017 +0530
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 5 07:52:51 2017 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2169aed0/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
index 8126a80..9645b37 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -672,12 +672,14 @@
(defn- tuple-time-delta! [^TupleImpl tuple]
(let [ms (.getProcessSampleStartTime tuple)]
(if ms
- (time-delta-ms ms))))
+ (time-delta-ms ms)
+ -1)))
(defn- tuple-execute-time-delta! [^TupleImpl tuple]
(let [ms (.getExecuteSampleStartTime tuple)]
(if ms
- (time-delta-ms ms))))
+ (time-delta-ms ms)
+ -1)))
(defn put-xor! [^Map pending key id]
(let [curr (or (.get pending key) (long 0))]
@@ -732,7 +734,7 @@
(log-message "Execute done TUPLE " tuple " TASK: " task-id " DELTA: " delta))
(task/apply-hooks user-context .boltExecute (BoltExecuteInfo. tuple task-id delta))
- (when delta
+ (when (<= 0 delta)
(stats/bolt-execute-tuple! executor-stats
(.getSourceComponent tuple)
(.getSourceStreamId tuple)
@@ -810,7 +812,7 @@
(when debug?
(log-message "BOLT ack TASK: " task-id " TIME: " delta " TUPLE: " tuple))
(task/apply-hooks user-context .boltAck (BoltAckInfo. tuple task-id delta))
- (when delta
+ (when (<= 0 delta)
(stats/bolt-acked-tuple! executor-stats
(.getSourceComponent tuple)
(.getSourceStreamId tuple)
@@ -825,7 +827,7 @@
(when debug?
(log-message "BOLT fail TASK: " task-id " TIME: " delta " TUPLE: " tuple))
(task/apply-hooks user-context .boltFail (BoltFailInfo. tuple task-id delta))
- (when delta
+ (when (<= 0 delta)
(stats/bolt-failed-tuple! executor-stats
(.getSourceComponent tuple)
(.getSourceStreamId tuple)
[2/2] storm git commit: Merge branch 'STORM-2677-1.x' into 1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2677-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cd4f9175
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cd4f9175
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cd4f9175
Branch: refs/heads/1.x-branch
Commit: cd4f9175fa1a9abcae7f678619c4a59440b06575
Parents: 8f79e69 2169aed
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Aug 5 07:53:18 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 5 07:53:18 2017 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------