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/14 16:47:13 UTC
[1/2] storm git commit: Revert "Merge branch
'apache-use-hb-cache-for-topo-info' of https://github.com/d2r/storm into
STORM-599"
Repository: storm
Updated Branches:
refs/heads/master bcb448d20 -> fca7c7673
Revert "Merge branch 'apache-use-hb-cache-for-topo-info' of https://github.com/d2r/storm into STORM-599"
This reverts commit ac3bfc1815962cc2458ae9c6bbf04912210dd153, reversing
changes made to f874464795685860c31fef5307f8ced39ed9480a.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fca7c767
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fca7c767
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fca7c767
Branch: refs/heads/master
Commit: fca7c7673d6b7e3163531e0267789bfc37229c8b
Parents: e7dfcb2
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 14 09:41:12 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 14 09:46:37 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fca7c767/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 e7e618f..1fbf7f0 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -365,8 +365,7 @@
nimbus-time
(>= (time-delta nimbus-time) timeout))
:nimbus-time nimbus-time
- :executor-reported-time reported-time
- :heartbeat hb}))
+ :executor-reported-time reported-time}))
(defn update-heartbeat-cache [cache executor-beats all-executors timeout]
(let [cache (select-keys cache all-executors)]
@@ -1262,9 +1261,11 @@
_ (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 @(:heartbeats-cache nimbus))
+ beats (.executor-beats storm-cluster-state storm-id (:executor->node+port assignment))
all-components (-> task->component reverse-map keys)
errors (->> all-components
(map (fn [c] [c (get-errors storm-cluster-state storm-id c)]))
[2/2] storm git commit: Revert "Added STORM-599 to Changelog"
Posted by bo...@apache.org.
Revert "Added STORM-599 to Changelog"
This reverts commit 5314b88a491d1ef972ff35ad0cd675efad7bfcda.
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e7dfcb2d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e7dfcb2d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e7dfcb2d
Branch: refs/heads/master
Commit: e7dfcb2d6dc0c80fd8a8f6ba9bbac826a932a244
Parents: bcb448d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 14 09:38:07 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 14 09:46:37 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e7dfcb2d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23f709c..44f7bab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,6 @@
* STORM-611: Remove extra "break"s
* STORM-610: Check the return value of fts_close()
* STORM-442: multilang ShellBolt/ShellSpout die() can be hang when Exception happened
- * STORM-599: Use use nimbus's cached heartbeats rather than fetching again from ZK
* STORM-410: Add groups support to log-viewer
* STORM-444: Add AutoHDFS like credential fetching for HBase
* STORM-552: Add netty socket backlog config