You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/08/19 03:11:37 UTC
[1/2] storm git commit: STORM-2500: remove call to waitUntilReady
Repository: storm
Updated Branches:
refs/heads/1.x-branch d81893bbb -> 9b4c1e93e
STORM-2500: remove call to waitUntilReady
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9c266916
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9c266916
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9c266916
Branch: refs/heads/1.x-branch
Commit: 9c26691657283972bc78e219790ce69abe8e9e2c
Parents: d81893b
Author: Zachary.smith <Za...@yodle.com>
Authored: Wed Aug 16 12:21:11 2017 -0400
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 19 12:11:25 2017 +0900
----------------------------------------------------------------------
.../storm/pacemaker/pacemaker_state_factory.clj | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9c266916/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
index 3889dcf..cb364d1 100644
--- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
+++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
@@ -106,14 +106,13 @@
(defn get-pacemaker-write-client [conf servers client-pool]
;; Client should be created in case of an exception or first write call
;; Shutdown happens in the retry loop
- (try
- (.waitUntilReady
- (let [client (get @client-pool (first @servers))]
- (if (nil? client)
- (do
- (swap! client-pool merge {(first @servers) (PacemakerClient. conf (first @servers))})
- (get @client-pool (first @servers)))
- client)))
+ (try
+ (let [client (get @client-pool (first @servers))]
+ (if (nil? client)
+ (do
+ (swap! client-pool merge {(first @servers) (PacemakerClient. conf (first @servers))})
+ (get @client-pool (first @servers)))
+ client))
(catch Exception e
(throw e))))
[2/2] storm git commit: Merge branch 'STORM-2500-1.x-merge' into
1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2500-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9b4c1e93
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b4c1e93
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b4c1e93
Branch: refs/heads/1.x-branch
Commit: 9b4c1e93e731cf1f0cc23b1aa1a1bbb4a68c6ea4
Parents: d81893b 9c26691
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Aug 19 12:11:31 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 19 12:11:31 2017 +0900
----------------------------------------------------------------------
.../storm/pacemaker/pacemaker_state_factory.clj | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------