Fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d9ca88ac Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d9ca88ac Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d9ca88ac Branch: refs/heads/master Commit: d9ca88ac53cf512ee19241f9f0d4eec5d37ab514 Parents: 99c62d4 Author: Kishor Patil <[email protected]> Authored: Wed Apr 25 17:06:35 2018 -0400 Committer: Kishor Patil <[email protected]> Committed: Wed Apr 25 17:06:35 2018 -0400 ---------------------------------------------------------------------- .../storm/cluster/PaceMakerStateStorage.java | 2 +- .../apache/storm/pacemaker/PacemakerClient.java | 17 +++++++---------- .../storm/pacemaker/PacemakerClientPool.java | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/d9ca88ac/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java index 47a3501..54d3f91 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java @@ -129,7 +129,7 @@ public class PaceMakerStateStorage implements IStateStorage { } LOG.debug("Successful set_worker_hb"); break; - } catch (HBExecutionException|PacemakerConnectionException e) { + } catch (HBExecutionException | PacemakerConnectionException e) { if (retry <= 0) { throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/storm/blob/d9ca88ac/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index 1f03854..46b7683 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@ -52,7 +52,7 @@ public class PacemakerClient implements ISaslClient { private LinkedBlockingQueue<Integer> availableMessageSlots; private ThriftNettyClientCodec.AuthMethod authMethod; private static final int maxRetries = 10; - + private StormBoundedExponentialBackoffRetry backoff = new StormBoundedExponentialBackoffRetry(100, 5000, 20); private int retryTimes = 0; @@ -106,8 +106,7 @@ public class PacemakerClient implements ISaslClient { ThreadFactory bossFactory = new NettyRenameThreadFactory("client-boss"); ThreadFactory workerFactory = new NettyRenameThreadFactory("client-worker"); NioClientSocketChannelFactory factory = - new NioClientSocketChannelFactory(Executors.newCachedThreadPool(bossFactory), - Executors.newCachedThreadPool(workerFactory)); + new NioClientSocketChannelFactory(Executors.newCachedThreadPool(bossFactory), Executors.newCachedThreadPool(workerFactory)); bootstrap = new ClientBootstrap(factory); bootstrap.setOption("tcpNoDelay", true); bootstrap.setOption("sendBufferSize", 5242880); @@ -116,8 +115,7 @@ public class PacemakerClient implements ISaslClient { remote_addr = new InetSocketAddress(host, port); int thriftMessageMaxSize = (Integer) config.get(Config.PACEMAKER_THRIFT_MESSAGE_SIZE_MAX); ChannelPipelineFactory pipelineFactory = - new ThriftNettyClientCodec(this, config, authMethod, host, thriftMessageMaxSize) - .pipelineFactory(); + new ThriftNettyClientCodec(this, config, authMethod, host, thriftMessageMaxSize).pipelineFactory(); bootstrap.setPipelineFactory(pipelineFactory); bootstrap.connect(remote_addr); } @@ -242,11 +240,10 @@ public class PacemakerClient implements ISaslClient { public void reconnect() { final PacemakerClient client = this; timer.schedule(new TimerTask() { - public void run() { - client.doReconnect(); - } - }, - backoff.getSleepTimeMs(retryTimes++, 0)); + public void run() { + client.doReconnect(); + } + }, backoff.getSleepTimeMs(retryTimes++, 0)); ready.set(false); setupMessaging(); } http://git-wip-us.apache.org/repos/asf/storm/blob/d9ca88ac/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java index 6721ecb..bfed672 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java @@ -46,7 +46,7 @@ public class PacemakerClientPool { servers = new ConcurrentLinkedQueue<>(); } } - + public HBMessage send(HBMessage m) throws PacemakerConnectionException, InterruptedException { try { return getWriteClient().send(m); @@ -59,7 +59,7 @@ 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) { + for (String s : servers) { try { HBMessage response = getClientForServer(s).send(m); responses.add(response);
