Skip to content

MINOR: Fix pacemaker_state_factory.clj not compile problem #2142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chengxinglin wants to merge 2 commits into from
Closed

MINOR: Fix pacemaker_state_factory.clj not compile problem #2142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf89fa6
MINOR: Fix pacemaker_state_factory.clj not compile problem
May 27, 2017
d51b70e
modify pacemaker_state_factory.clj
May 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,15 @@
(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)))
(catch Exception e
(throw e))))
(let [client (get @client-pool (first @servers))]
(try
(.waitUntilReady
(let [] (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)))
(get @client-pool (first @servers))))
Copy link
Contributor

@revans2 revans2 Jun 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitUntilReady is not actually needed because send will call it internally. We can just skip calling it here all together. This then lets us have something like ...

(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
   (let [server (first @servers)]
          (or (get @client-pool server)
              (get (swap! client-pool merge {server (PacemakerClient. conf server)}) server))))

and we can then remove the update to PacemakerClient.java


;; So we can mock the client for testing
(defn makeClientPool [conf client-pool servers]
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public HBMessage send(HBMessage m) throws PacemakerConnectionException {
}
}

private void waitUntilReady() throws PacemakerConnectionException {
public void waitUntilReady() throws PacemakerConnectionException {
// Wait for 'ready' (channel connected and maybe authentication)
if(!ready.get() || channelRef.get() == null) {
synchronized(this) {
Expand Down