You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/10/05 22:02:27 UTC
[11/16] storm git commit: Addressing comments by d2r
Addressing comments by d2r
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/837591df
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/837591df
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/837591df
Branch: refs/heads/master
Commit: 837591df3fc9047055b16f64527cbbec59684849
Parents: 6a657f1
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Sep 26 16:31:50 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Sep 26 16:31:50 2016 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 1 -
.../jvm/org/apache/storm/cluster/PaceMakerStateStorage.java | 1 -
.../org/apache/storm/cluster/PaceMakerStateStorageFactory.java | 6 ++----
.../jvm/org/apache/storm/pacemaker/PacemakerClientPool.java | 3 +--
.../jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java | 2 --
5 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/837591df/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 11bf641..f76c4ab 100644
--- 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
http://git-wip-us.apache.org/repos/asf/storm/blob/837591df/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java b/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
index dff1180..652dcb9 100644
--- 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 class PaceMakerStateStorage implements IStateStorage {
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);
http://git-wip-us.apache.org/repos/asf/storm/blob/837591df/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java b/storm-core/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
index 4bd1384..6a4925a 100644
--- 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) {
http://git-wip-us.apache.org/repos/asf/storm/blob/837591df/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
index 6033293..1fd00c1 100644
--- 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 @@ import org.slf4j.LoggerFactory;
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 @@ public class PacemakerClientPool {
}
return client;
}
-
}
http://git-wip-us.apache.org/repos/asf/storm/blob/837591df/storm-core/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java b/storm-core/test/jvm/org/apache/storm/PaceMakerStateStorageFactoryTest.java
index aae0869..582dec0 100644
--- 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.Logger;
import org.slf4j.LoggerFactory;
public class PaceMakerStateStorageFactoryTest {
- private static Logger LOG = LoggerFactory.getLogger(PaceMakerStateStorageFactoryTest.class);
-
private PaceMakerClientProxy clientProxy;
private PacemakerClientPoolProxy clientPoolProxy;
private PaceMakerStateStorage stateStorage;