Merge branch 'master' of github.com:apache/storm into fix-style
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99c62d49 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99c62d49 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99c62d49 Branch: refs/heads/master Commit: 99c62d4943904233197f9d820ce63cacf16ec0f0 Parents: e8ffac4 7673253 Author: Kishor Patil <[email protected]> Authored: Wed Apr 25 16:58:32 2018 -0400 Committer: Kishor Patil <[email protected]> Committed: Wed Apr 25 17:04:24 2018 -0400 ---------------------------------------------------------------------- .../storm/cluster/PaceMakerStateStorage.java | 2 +- .../apache/storm/pacemaker/PacemakerClient.java | 40 +++++++++++--------- .../storm/pacemaker/PacemakerClientPool.java | 33 ++++++++++++---- 3 files changed, 50 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/99c62d49/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/99c62d49/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java ---------------------------------------------------------------------- diff --cc storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index d49db8b,8b46f55..1f03854 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@@ -51,6 -56,10 +51,8 @@@ public class PacemakerClient implement private HBMessage messages[]; private LinkedBlockingQueue<Integer> availableMessageSlots; private ThriftNettyClientCodec.AuthMethod authMethod; + private static final int maxRetries = 10; - - private static Timer timer = new Timer(true); - ++ private StormBoundedExponentialBackoffRetry backoff = new StormBoundedExponentialBackoffRetry(100, 5000, 20); private int retryTimes = 0; http://git-wip-us.apache.org/repos/asf/storm/blob/99c62d49/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java ---------------------------------------------------------------------- diff --cc storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java index dacd2e0,539e0a8..6721ecb --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java @@@ -54,12 -66,15 +59,15 @@@ public class PacemakerClientPool public List<HBMessage> sendAll(HBMessage m) throws PacemakerConnectionException, InterruptedException { List<HBMessage> responses = new ArrayList<HBMessage>(); LOG.debug("Using servers: {}", servers); - for (String s : servers) { - HBMessage response = getClientForServer(s).send(m); - responses.add(response); - + for(String s : servers) { + try { + HBMessage response = getClientForServer(s).send(m); + responses.add(response); + } catch (PacemakerConnectionException e) { + LOG.warn("Failed to connect to the pacemaker server {}", s); + } } - if(responses.size() == 0) { + if (responses.size() == 0) { throw new PacemakerConnectionException("Failed to connect to any Pacemaker."); } return responses;
