commit 277ea2891ee293802e7505a20b4207ae68edeeaa
author Tim <twilliams@apache.org> Tue Jul 29 13:52:06 2014 -0400
committer Tim <twilliams@apache.org> Tue Jul 29 13:52:06 2014 -0400
tree c039084b77c9ebc22304e69fed5da67e47577678
parent 33963185a9b7ceb11f9c5a002d3ca3793a1a8fe4

remove persistent controllers

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 bf10b8c..0a9a57d 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
@@ -245,18 +245,7 @@
 
   @Override
   public List<String> getControllerServerList() {
-    long s = System.nanoTime();
-    try {
-      checkIfOpen();
-      return _zk.getChildren(ZookeeperPathConstants.getControllersPath(), false);
-    } catch (KeeperException e) {
-      throw new RuntimeException(e);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    } finally {
-      long e = System.nanoTime();
-      LOG.debug("trace getControllerServerList [" + (e - s) / 1000000.0 + " ms]");
-    }
+    return getOnlineControllerList();
   }
 
   @Override

blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java

diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
index a0453bc..e378c44 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
@@ -273,7 +273,6 @@
   private void setupZookeeper() throws KeeperException, InterruptedException {
     BlurUtil.createIfMissing(_zookeeper, "/blur");
     BlurUtil.createIfMissing(_zookeeper, ZookeeperPathConstants.getOnlineControllersPath());
-    BlurUtil.createIfMissing(_zookeeper, ZookeeperPathConstants.getControllersPath());
     BlurUtil.createIfMissing(_zookeeper, ZookeeperPathConstants.getClustersPath());
   }
 
@@ -387,20 +386,6 @@
   }
 
   private void registerMyself() {
-    // Register Node
-    try {
-      String controllerPath = ZookeeperPathConstants.getControllersPath() + "/" + _nodeName;
-      if (_zookeeper.exists(controllerPath, false) == null) {
-        // Don't set the version for the registered nodes but only to the online
-        // nodes.
-        _zookeeper.create(controllerPath, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-      }
-    } catch (KeeperException e) {
-      throw new RuntimeException(e);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-
     // Wait for other instances (named the same name) to die
     try {
       String version = BlurUtil.getVersion();