Merge branch '0.5.x'

README.md

@@ -71,6 +71,10 @@ Official plugins are vetted by Michael Drogalis. Ensure in your project that plu
 
 Generate plugin templates through Leiningen with [`onyx-plugin`](https://github.com/MichaelDrogalis/onyx-plugin).
 
+### Offical Dashboard
+
+You can run a dashboard to monitor Onyx cluster activity, found [here](https://github.com/lbradstreet/onyx-dashboard).
+
 ### lib-onyx
 
 [lib-onyx](https://github.com/MichaelDrogalis/lib-onyx) is a library created to support extra functionality in Onyx. It provides pluggable functionality such as in-memory streaming joins, automatic message retry, and interval-based actions.

project.clj

@@ -1,4 +1,4 @@
-(defproject com.mdrogalis/onyx "0.5.3-SNAPSHOT"
+(defproject com.mdrogalis/onyx "0.5.2"
   :description "Distributed, masterless, fault tolerant data processing for Clojure"
   :url "https://github.com/MichaelDrogalis/onyx"
   :license {:name "Eclipse Public License"

src/onyx/log/commands/common.clj

@@ -268,6 +268,8 @@
 (defmethod drop-peers :default
   [replica job n]
   (let [scheduler (get-in replica [:task-schedulers job])]
-    (throw (ex-info (format "Task scheduler %s not recognized" scheduler)
-                    {:replica replica}))))
+    (throw (ex-info 
+             (format "Task scheduler %s not recognized. Check that you have not supplied a job scheduler instead." 
+                     scheduler)
+             {:replica replica}))))
 

src/onyx/log/commands/volunteer_for_task.clj

@@ -46,9 +46,10 @@
 
 (defmethod select-task :default
   [replica job peer-id]
-  (throw (ex-info (format "Task scheduler %s not recognized"
-                          (get-in replica [:task-schedulers job]))
-                  {:replica replica})))
+  (throw (ex-info 
+           (format "Task scheduler %s not recognized. Check that you have not supplied a job scheduler instead."
+                   (get-in replica [:task-schedulers job]))
+           {:replica replica})))
 
 (defmulti select-job
   (fn [{:keys [args]} replica]
@@ -112,8 +113,10 @@
 
 (defmethod select-job :default
   [_ replica]
-  (throw (ex-info (format "Job scheduler %s not recognized" (:job-scheduler replica))
-                  {:replica replica})))
+  (throw (ex-info 
+           (format "Job scheduler %s not recognized. Check that you have not supplied a task scheduler instead." 
+                   (:job-scheduler replica))
+           {:replica replica})))
 
 (defmethod extensions/apply-log-entry :volunteer-for-task
   [entry replica]

src/onyx/log/zookeeper.clj

@@ -167,6 +167,9 @@
                      (>!! ch position)
                      (recur)))))
              (recur (inc position)))))
+       (catch org.apache.zookeeper.KeeperException$ConnectionLossException e
+         ;; ZooKeeper has been shutdown, close the subscriber cleanly.
+         (close! ch))
        (catch Exception e
          (fatal e))))
     (<!! rets)))