From 0af1d08c690b1bed68669e4fd291a7c186ea185c Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Mon, 30 Mar 2015 12:24:13 -0500 Subject: [PATCH] Fix for STORM-694 --- .../clj/backtype/storm/daemon/supervisor.clj | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj index bc8b9991d0a..d9aaaa3b320 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -18,7 +18,6 @@ (:import [backtype.storm.scheduler ISupervisor] [backtype.storm.utils LocalState Time Utils] [backtype.storm.daemon Shutdownable] - [backtype.storm.daemon.common SupervisorInfo] [backtype.storm Constants] [java.net JarURLConnection] [java.net URI] @@ -506,14 +505,14 @@ heartbeat-fn (fn [] (.supervisor-heartbeat! (:storm-cluster-state supervisor) (:supervisor-id supervisor) - (SupervisorInfo. (current-time-secs) - (:my-hostname supervisor) - (:assignment-id supervisor) - (keys @(:curr-assignment supervisor)) - ;; used ports - (.getMetadata isupervisor) - (conf SUPERVISOR-SCHEDULER-META) - ((:uptime supervisor)))))] + (->SupervisorInfo (current-time-secs) + (:my-hostname supervisor) + (:assignment-id supervisor) + (keys @(:curr-assignment supervisor)) + ;; used ports + (.getMetadata isupervisor) + (conf SUPERVISOR-SCHEDULER-META) + ((:uptime supervisor)))))] (heartbeat-fn) ;; should synchronize supervisor so it doesn't launch anything after being down (optimization) (schedule-recurring (:heartbeat-timer supervisor)