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/20 19:47:11 UTC
[1/4] storm git commit: use hb cache instead of fetching via zk
Repository: storm
Updated Branches:
refs/heads/master e485e08e0 -> bc54e8ed5
use hb cache instead of fetching via zk
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1d973c68
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1d973c68
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1d973c68
Branch: refs/heads/master
Commit: 1d973c6838118e64024505269b82baffd0f41f8d
Parents: 94b9608
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Jan 14 11:12:30 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 14 11:12:30 2015 -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/1d973c68/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..a7dacb8 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 (get @(:heartbeats-cache nimbus) storm-id))
all-components (-> task->component reverse-map keys)
errors (->> all-components
(map (fn [c] [c (get-errors storm-cluster-state storm-id c)]))
[2/4] storm git commit: Remove unnecessary code
Posted by bo...@apache.org.
Remove unnecessary code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc952d4c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc952d4c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc952d4c
Branch: refs/heads/master
Commit: fc952d4c64f52e29cd162ffacee984ef36ab9447
Parents: 1d973c6
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Jan 14 11:13:05 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 14 11:13:05 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fc952d4c/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 a7dacb8..b2cb96a 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1262,9 +1262,7 @@
_ (check-authorization! nimbus storm-name topology-conf "getTopologyInfo")
task->component (storm-task-info (try-read-storm-topology conf storm-id) topology-conf)
base (.storm-base storm-cluster-state storm-id nil)
- storm-name (if base (:storm-name base) (throw (NotAliveException. (str storm-id))))
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 (map-val :heartbeat (get @(:heartbeats-cache nimbus) storm-id))
all-components (-> task->component reverse-map keys)
[4/4] storm git commit: Added STORM-599 to Changelog
Posted by bo...@apache.org.
Added STORM-599 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bc54e8ed
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bc54e8ed
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bc54e8ed
Branch: refs/heads/master
Commit: bc54e8ed5a6c53f8069dc411654ad6b040a5e2d3
Parents: 7816f5a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 20 12:35:17 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 20 12:35:17 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bc54e8ed/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19eaf23..92cfcf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
* STORM-600: upgrade jacoco plugin to support jdk8
* STORM-495: KafkaSpout retries with exponential backoff
* STORM-620: Duplicate maven plugin declaration
+ * STORM-599: Use use nimbus's cached heartbeats rather than fetching again from ZK
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
[3/4] storm git commit: Merge branch 'STORM-599-use-cached-hbs' of
https://github.com/d2r/storm into STORM-599
Posted by bo...@apache.org.
Merge branch 'STORM-599-use-cached-hbs' of https://github.com/d2r/storm into STORM-599
STORM-599: Use use nimbus's cached heartbeats rather than fetching again from ZK
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7816f5a4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7816f5a4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7816f5a4
Branch: refs/heads/master
Commit: 7816f5a4292ccff0ebd18f517490a2e984421327
Parents: e485e08 fc952d4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 20 12:34:33 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 20 12:34:33 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------