revert unrelated changes to supervisor.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4e0ff2f6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4e0ff2f6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4e0ff2f6 Branch: refs/heads/master Commit: 4e0ff2f6e238a59c13d9af6dc3db84ae5817365f Parents: b1c8188 Author: å«ä¹ <[email protected]> Authored: Thu Mar 3 10:21:55 2016 +0800 Committer: å«ä¹ <[email protected]> Committed: Thu Mar 3 10:21:55 2016 +0800 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/4e0ff2f6/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj index c1529c0..7295679 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj @@ -35,6 +35,7 @@ (:use [org.apache.storm.daemon common]) (:import [org.apache.storm.command HealthCheck]) (:require [org.apache.storm.daemon [worker :as worker]] + [clojure.set :as set]) (:import [org.apache.thrift.transport TTransportException]) (:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms]) @@ -79,6 +80,7 @@ new-profiler-actions (->> (dofor [sid (distinct storm-ids)] + (if-let [topo-profile-actions (into [] (for [request (.getTopologyProfileRequests storm-cluster-state sid)] (clojurify-profile-request request)))] {sid topo-profile-actions})) (apply merge))]
