more informative logging in supervisor

Nathan Marz · Nathan Marz · commit 25fcbf903cb9 · 2012-06-13T16:55:45.000-07:00
diff --git a/src/clj/backtype/storm/daemon/supervisor.clj b/src/clj/backtype/storm/daemon/supervisor.clj
@@ -89,10 +89,9 @@
 
 (defn read-allocated-workers
   "Returns map from worker id to worker heartbeat. if the heartbeat is nil, then the worker is dead (timed out or never wrote heartbeat)"
-  [supervisor assigned-tasks]
+  [supervisor assigned-tasks now]
   (let [conf (:conf supervisor)
         ^LocalState local-state (:local-state supervisor)
-        now (current-time-secs)
         id->heartbeat (read-worker-heartbeats conf)
         approved-ids (set (keys (.get local-state LS-APPROVED-WORKERS)))]
     (into
@@ -189,7 +188,8 @@
         ^LocalState local-state (:local-state supervisor)
         assigned-tasks (defaulted (.get local-state LS-LOCAL-ASSIGNMENTS)
                                   {})
-        allocated (read-allocated-workers supervisor assigned-tasks)
+        now (current-time-secs)
+        allocated (read-allocated-workers supervisor assigned-tasks now)
         keepers (filter-val
                  (fn [[state _]] (= state :valid))
                  allocated)
@@ -217,6 +217,7 @@
       (when (not= :valid state)
         (log-message
          "Shutting down and clearing state for id " id
+         ". Current supervisor time: " now
          ". State: " state
          ", Heartbeat: " (pr-str heartbeat))
         (shutdown-worker supervisor id)
