[3/5] storm git commit: Worker should retry later instead of dying on failure to send heartbeats to ZK/Pacemaker

[pt...@apache.org]

Worker should retry later instead of dying on failure to send heartbeats to ZK/Pacemaker


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b0e69606
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b0e69606
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b0e69606

Branch: refs/heads/1.x-branch
Commit: b0e696062ec690dc7e279349ce4d0015cd96c08d
Parents: 0111645
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Tue Jan 26 17:49:11 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Tue Jan 26 17:50:23 2016 +0000

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/daemon/worker.clj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b0e69606/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/worker.clj b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
index 9607d77..edef2c4 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@ -72,8 +72,10 @@
                :time-secs (current-time-secs)
                }]
     ;; do the zookeeper heartbeat
-    (.worker-heartbeat! (:storm-cluster-state worker) (:storm-id worker) (:assignment-id worker) (:port worker) zk-hb)
-    ))
+    (try
+      (.worker-heartbeat! (:storm-cluster-state worker) (:storm-id worker) (:assignment-id worker) (:port worker) zk-hb)
+      (catch Exception exc
+        (log-error exc "Worker failed to write heatbeats to ZK or Pacemaker...will retry")))))
 
 (defn do-heartbeat [worker]
   (let [conf (:conf worker)