Merge branch 'master' into 0.9.0

jasonjckn · Jan 9, 2013 · 695abab · 695abab
2 parents 1b1c1fd + 458b9f2
commit 695abab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/clj/backtype/storm/scheduler/IsolationScheduler.clj b/src/clj/backtype/storm/scheduler/IsolationScheduler.clj
@@ -192,17 +192,17 @@
             (.blacklistHost cluster host))
           )))
 
-    (let [non-iso-topologies (->> topology-worker-specs
+    (let [failed-iso-topologies (->> topology-worker-specs
                                   (mapcat (fn [[top-id worker-specs]]
                                     (if-not (empty? worker-specs) [top-id])
                                     )))]
-      (if (empty? non-iso-topologies)
+      (if (empty? failed-iso-topologies)
         ;; run default scheduler on non-isolated topologies
         (-<> topology-worker-specs
              allocated-topologies
              (leftover-topologies topologies <>)
              (DefaultScheduler/default-schedule <> cluster))
-        (log-warn "Unstable to isolate topologies " (pr-str non-iso-topologies) ". Will wait for enough resources for isolated topologies before allocating any other resources.")
+        (log-warn "Unstable to isolate topologies " (pr-str failed-iso-topologies) ". Will wait for enough resources for isolated topologies before allocating any other resources.")
         ))
     (.setBlacklistedHosts cluster orig-blacklist)
     ))