You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/06 22:46:18 UTC
[2/4] storm git commit: use the cache instead of downloading from zk
use the cache instead of downloading from zk
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3907b2d7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3907b2d7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3907b2d7
Branch: refs/heads/master
Commit: 3907b2d780b796e754bf3566d29567cff6e77679
Parents: da02d8c
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Sat Dec 13 09:36:31 2014 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Dec 22 15:02:05 2014 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3907b2d7/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 1fbf7f0..29dbc05 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -365,7 +365,8 @@
nimbus-time
(>= (time-delta nimbus-time) timeout))
:nimbus-time nimbus-time
- :executor-reported-time reported-time}))
+ :executor-reported-time reported-time
+ :heartbeat hb}))
(defn update-heartbeat-cache [cache executor-beats all-executors timeout]
(let [cache (select-keys cache all-executors)]
@@ -1265,7 +1266,7 @@
launch-time-secs (if base (:launch-time-secs base) (throw (NotAliveException. (str storm-id))))
task->component (storm-task-info (try-read-storm-topology conf storm-id) topology-conf)
assignment (.assignment-info storm-cluster-state storm-id nil)
- beats (.executor-beats storm-cluster-state storm-id (:executor->node+port assignment))
+ beats (map-val :heartbeat @(:heartbeats-cache nimbus))
all-components (-> task->component reverse-map keys)
errors (->> all-components
(map (fn [c] [c (get-errors storm-cluster-state storm-id c)]))