Addressing comments by d2r

aqeelvn · Sep 26, 2016 · 837591d · 837591d
1 parent 6a657f1
commit 837591d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
@@ -275,7 +275,6 @@ resource.aware.scheduler.priority.strategy: "org.apache.storm.scheduler.resource
 
 dev.zookeeper.path: "/tmp/dev-storm-zookeeper"
 
-pacemaker.host: "localhost"
 pacemaker.servers: []
 pacemaker.port: 6699
 pacemaker.base.threads: 10

diff --git a/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java b/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
@@ -180,7 +180,6 @@ public List<String> get_worker_hb_children(String path, boolean watch) {
         while (true) {
             try {
                 HashSet<String> retSet = new HashSet<>();
-                int latest_time_secs = 0;
 
                 HBMessage message = new HBMessage(HBServerMessageType.GET_ALL_NODES_FOR_PATH, HBMessageData.path(path));
                 List<HBMessage> responses = pacemakerClientPool.sendAll(message);

diff --git a/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java b/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
@@ -17,14 +17,12 @@
  */
 package org.apache.storm.cluster;
 
-import org.apache.storm.pacemaker.PacemakerClient;
+import java.util.List;
+import java.util.Map;
 import org.apache.storm.pacemaker.PacemakerClientPool;
 import org.apache.storm.utils.Utils;
 import org.apache.zookeeper.data.ACL;
 
-import java.util.List;
-import java.util.Map;
-
 public class PaceMakerStateStorageFactory implements StateStorageFactory {
     @Override
     public IStateStorage mkStore(Map config, Map auth_conf, List<ACL> acls, ClusterStateContext context) {

diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
@@ -30,7 +30,7 @@
 
 public class PacemakerClientPool {
 
-        private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientPool.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientPool.class);
 
     private ConcurrentHashMap<String, PacemakerClient> clientForServer = new ConcurrentHashMap<>();
     private ConcurrentLinkedQueue<String> servers;
@@ -110,5 +110,4 @@ private PacemakerClient getClientForServer(String server) {
         }
         return client;
     }
-
 }
diff --git a/storm-core/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java b/storm-core/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java
@@ -32,8 +32,6 @@
 import org.slf4j.LoggerFactory;
 
 public class PaceMakerStateStorageFactoryTest {
-    private static Logger LOG = LoggerFactory.getLogger(PaceMakerStateStorageFactoryTest.class);
-
     private PaceMakerClientProxy clientProxy;
     private PacemakerClientPoolProxy clientPoolProxy;
     private PaceMakerStateStorage stateStorage;