incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject [2/7] git commit: remove some remaining remnants of persistent ports for blur-342
Date Thu, 18 Sep 2014 01:58:13 GMT
remove some remaining remnants of persistent ports for blur-342


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/bc474f86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/bc474f86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/bc474f86

Branch: refs/heads/blur-374
Commit: bc474f862c0f2a2f0a44a85ff305a7052c3b792d
Parents: f91db75
Author: twilliams <twilliams@apache.org>
Authored: Sun Sep 14 09:47:37 2014 -0400
Committer: twilliams <twilliams@apache.org>
Committed: Sun Sep 14 09:47:37 2014 -0400

----------------------------------------------------------------------
 .../clusterstatus/ZookeeperClusterStatus.java        |  4 ++--
 .../manager/indexserver/DistributedIndexServer.java  | 15 ---------------
 .../main/java/org/apache/blur/utils/BlurUtil.java    |  1 -
 .../blur/zookeeper/ZookeeperPathConstants.java       |  8 --------
 4 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/bc474f86/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
index 0a9a57d..0b2e3fe 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
@@ -293,8 +293,8 @@ public class ZookeeperClusterStatus extends ClusterStatus {
     long s = System.nanoTime();
     try {
       checkIfOpen();
-      String registeredShardsPath = ZookeeperPathConstants.getRegisteredShardsPath(cluster);
-      return _zk.getChildren(registeredShardsPath, false);
+      String shardsPath = ZookeeperPathConstants.getOnlineShardsPath(cluster);
+      return _zk.getChildren(shardsPath, false);
     } catch (KeeperException e) {
       throw new RuntimeException(e);
     } catch (InterruptedException e) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/bc474f86/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
b/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
index 46c0d38..56d3d04 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
@@ -160,7 +160,6 @@ public class DistributedIndexServer extends AbstractDistributedIndexServer
{
     _timerCacheFlush = setupFlushCacheTimer();
     _timerCacheFlush.start();
 
-    registerMyselfAsMemberOfCluster();
     String onlineShardsPath = ZookeeperPathConstants.getOnlineShardsPath(_cluster);
     String safemodePath = ZookeeperPathConstants.getSafemodePath(_cluster);
 
@@ -411,20 +410,6 @@ public class DistributedIndexServer extends AbstractDistributedIndexServer
{
     }
   }
 
-  private void registerMyselfAsMemberOfCluster() {
-    String nodeName = getNodeName();
-    String registeredShardsPath = ZookeeperPathConstants.getRegisteredShardsPath(_cluster)
+ "/" + nodeName;
-    try {
-      if (_zookeeper.exists(registeredShardsPath, false) == null) {
-        _zookeeper.create(registeredShardsPath, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-      }
-    } catch (KeeperException e) {
-      throw new RuntimeException(e);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   private void cleanup() {
     clearMapOfOldTables(_layout);
     clearMapOfOldTables(_distributedLayoutFactory.getLayoutCache());

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/bc474f86/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java b/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
index b57573d..3da813f 100644
--- a/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
+++ b/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
@@ -434,7 +434,6 @@ public class BlurUtil {
     if (cluster != null) {
       BlurUtil.createIfMissing(zookeeper, ZookeeperPathConstants.getClusterPath(cluster));
       BlurUtil.createIfMissing(zookeeper, ZookeeperPathConstants.getSafemodePath(cluster));
-      BlurUtil.createIfMissing(zookeeper, ZookeeperPathConstants.getRegisteredShardsPath(cluster));
       BlurUtil.createIfMissing(zookeeper, ZookeeperPathConstants.getOnlineShardsPath(cluster));
       BlurUtil.createIfMissing(zookeeper, ZookeeperPathConstants.getTablesPath(cluster));
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/bc474f86/blur-util/src/main/java/org/apache/blur/zookeeper/ZookeeperPathConstants.java
----------------------------------------------------------------------
diff --git a/blur-util/src/main/java/org/apache/blur/zookeeper/ZookeeperPathConstants.java
b/blur-util/src/main/java/org/apache/blur/zookeeper/ZookeeperPathConstants.java
index 325ef6e..d892c2c 100644
--- a/blur-util/src/main/java/org/apache/blur/zookeeper/ZookeeperPathConstants.java
+++ b/blur-util/src/main/java/org/apache/blur/zookeeper/ZookeeperPathConstants.java
@@ -35,10 +35,6 @@ public class ZookeeperPathConstants {
     return getBasePath() + "/online-controller-nodes";
   }
 
-  public static String getControllersPath() {
-    return getBasePath() + "/controller-nodes";
-  }
-
   public static String getOnlineShardsPath(String cluster) {
     return getClusterPath(cluster) + "/online-nodes";
   }
@@ -59,10 +55,6 @@ public class ZookeeperPathConstants {
     return getClusterPath(cluster) + "/shutdown";
   }
 
-  public static String getRegisteredShardsPath(String cluster) {
-    return getClusterPath(cluster) + "/registered-nodes";
-  }
-
   public static String getShardLayoutPath(String cluster) {
     return getClusterPath(cluster) + "/layout";
   }


Mime
View raw message