svn commit: r1457082 - in /accumulo/branches/1.5: server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java start/src/main/java/org/apache/accumulo/start/Main.java

[ec...@apache.org]

Author: ecn
Date: Fri Mar 15 19:50:14 2013
New Revision: 1457082

URL: http://svn.apache.org/r1457082
Log:
ACCUMULO-1179 added zookeeper command

Added:
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java   (with props)
Modified:
    accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/Main.java

Added: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java?rev=1457082&view=auto
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java (added)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java Fri Mar 15 19:50:14 2013
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.util;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.cli.Help;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+
+import com.beust.jcommander.Parameter;
+
+public class ZooKeeperMain {
+  
+  static class Opts extends Help {
+    
+    @Parameter(names = {"-z", "--keepers"}, description = "Comma separated list of zookeeper hosts (host:port,host:port)")
+    String servers = null;
+    
+    @Parameter(names = {"-t", "--timeout"}, description = "timeout, in seconds to timeout the zookeeper connection")
+    long timeout = 30;
+  }
+  
+  public static void main(String[] args) throws Exception {
+    Opts opts = new Opts();
+    opts.parseArgs(ZooKeeperMain.class.getName(), args);
+    FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+    String baseDir = Constants.getBaseDir(ServerConfiguration.getSiteConfiguration());
+    System.out.println("Using " + fs.makeQualified(new Path(baseDir + "/instance_id")) + " to lookup accumulo instance");
+    Instance instance = HdfsZooInstance.getInstance();
+    if (opts.servers == null) {
+      opts.servers = instance.getZooKeepers();
+    }
+    System.out.println("The accumulo instance id is " + instance.getInstanceID());
+    org.apache.zookeeper.ZooKeeperMain.main(new String[]{"-server", opts.servers, "-timeout", "" + (opts.timeout * 1000)});
+  }
+}

Propchange: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/Main.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1457082&r1=1457081&r2=1457082&view=diff
==============================================================================
--- accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/Main.java (original)
+++ accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/Main.java Fri Mar 15 19:50:14 2013
@@ -73,6 +73,8 @@ public class Main {
         runTMP = cl.loadClass("org.apache.accumulo.core.file.rfile.PrintInfo");
       } else if (args[0].equals("login-info")) {
         runTMP = cl.loadClass("org.apache.accumulo.core.util.LoginProperties");
+      } else if (args[0].equals("zookeeper")) {
+        runTMP = cl.loadClass("org.apache.accumulo.server.util.ZooKeeperMain");
       } else {
         try {
           runTMP = cl.loadClass(args[0]);
@@ -115,6 +117,6 @@ public class Main {
   }
   
   private static void printUsage() {
-    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info | tracer | proxy | <accumulo class> args");
+    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info | tracer | proxy | zookeeper | <accumulo class> args");
   }
 }