incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject git commit: Remove old controller references
Date Thu, 21 Feb 2013 00:21:59 GMT
Updated Branches:
  refs/heads/0.2-dev b2676d17a -> b2627fc96


Remove old controller references


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

Branch: refs/heads/0.2-dev
Commit: b2627fc96143d74f8a83f92ab2be00dd89dbacfd
Parents: b2676d1
Author: twilliams <twilliams@apache.org>
Authored: Wed Feb 20 19:21:32 2013 -0500
Committer: twilliams <twilliams@apache.org>
Committed: Wed Feb 20 19:21:32 2013 -0500

----------------------------------------------------------------------
 .../src/test/java/org/apache/blur/MiniCluster.java |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/b2627fc9/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java b/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
index bcc6a0e..c795f10 100644
--- a/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
+++ b/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
@@ -17,7 +17,6 @@ package org.apache.blur;
  * limitations under the License.
  */
 
-import static org.apache.blur.utils.BlurConstants.BLUR_GUI_CONTROLLER_PORT;
 import static org.apache.blur.utils.BlurConstants.BLUR_GUI_SHARD_PORT;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BIND_PORT;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BLOCKCACHE_DIRECT_MEMORY_ALLOCATION;
@@ -70,7 +69,6 @@ public abstract class MiniCluster {
   private static MiniDFSCluster cluster;
   private static Thread serverThread;
   private static ZooKeeperServerMainEmbedded zooKeeperServerMain;
-  private static List<AbstractThriftServer> controllers = new ArrayList<AbstractThriftServer>();
   private static List<AbstractThriftServer> shards = new ArrayList<AbstractThriftServer>();
   private static int zkPort;
   private static String connectionStr;
@@ -83,17 +81,10 @@ public abstract class MiniCluster {
 
   public static void shutdownBlurCluster() {
     stopShards();
-    stopControllers();
     shutdownZooKeeper();
     shutdownDfs();
   }
 
-  public static void stopControllers() {
-    for (AbstractThriftServer s : controllers) {
-      s.close();
-    }
-  }
-
   public static void stopShards() {
     for (AbstractThriftServer s : shards) {
       s.close();
@@ -120,7 +111,6 @@ public abstract class MiniCluster {
     configuration.set(BLUR_SHARD_BLOCKCACHE_DIRECT_MEMORY_ALLOCATION, "false");
     configuration.set(BLUR_SHARD_BLOCKCACHE_SLAB_COUNT, "0");
     configuration.setLong(BLUR_SHARD_SAFEMODEDELAY, 5000);
-    configuration.setInt(BLUR_GUI_CONTROLLER_PORT, -1);
     configuration.setInt(BLUR_GUI_SHARD_PORT, -1);
 
     return configuration;


Mime
View raw message