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 2018/01/22 17:41:27 UTC

[21/38] storm git commit: STORM-2153: Add transferred metric

STORM-2153: Add transferred metric


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

Branch: refs/heads/1.x-branch
Commit: 47be75c8d2fc5f9c7901595fecb385393f9fab8b
Parents: 5ce45b7
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Dec 15 12:48:08 2017 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Dec 15 12:48:08 2017 -0500

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/daemon/task.clj | 4 ++--
 storm-core/src/clj/org/apache/storm/stats.clj       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/47be75c8/storm-core/src/clj/org/apache/storm/daemon/task.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/task.clj b/storm-core/src/clj/org/apache/storm/daemon/task.clj
index 8eb432e..7132fc1 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/task.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/task.clj
@@ -145,7 +145,7 @@
             (when (emit-sampler)
               (stats/emitted-tuple! executor-stats (StormMetricRegistry/counter "emitted" worker-context component-id (pr-str (:executor-id executor-data)) stream) stream)
               (if out-task-id
-                (stats/transferred-tuples! executor-stats stream 1)))
+                (stats/transferred-tuples! executor-stats (StormMetricRegistry/counter "transferred" worker-context component-id (pr-str (:executor-id executor-data)) stream) stream 1)))
             (if out-task-id [out-task-id])
             ))
         ([^String stream ^List values]
@@ -164,7 +164,7 @@
              (apply-hooks user-context .emit (EmitInfo. values stream task-id out-tasks))
              (when (emit-sampler)
                (stats/emitted-tuple! executor-stats (StormMetricRegistry/counter "emitted" worker-context component-id (pr-str (:executor-id executor-data)) stream) stream)
-               (stats/transferred-tuples! executor-stats stream (count out-tasks)))
+               (stats/transferred-tuples! executor-stats (StormMetricRegistry/counter "transferred" worker-context component-id (pr-str (:executor-id executor-data)) stream) stream (count out-tasks)))
              out-tasks)))
     ))
 

http://git-wip-us.apache.org/repos/asf/storm/blob/47be75c8/storm-core/src/clj/org/apache/storm/stats.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/stats.clj b/storm-core/src/clj/org/apache/storm/stats.clj
index 41aaf04..85c7bbe 100644
--- a/storm-core/src/clj/org/apache/storm/stats.clj
+++ b/storm-core/src/clj/org/apache/storm/stats.clj
@@ -125,8 +125,9 @@
     (.inc emitted-counter rate)))
 
 (defn transferred-tuples!
-  [stats stream amt]
+  [stats ^Counter transferred-counter stream amt]
   (let [^MultiCountStatAndMetric transferred (stats-transferred stats)]
+    (.inc transferred-counter amt)
     (.incBy transferred ^Object stream ^long (* (stats-rate stats) amt))))
 
 (defn bolt-execute-tuple!