accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1353663 [6/6] - in /accumulo/branches/ACCUMULO-259: ./ bin/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/512MB/native-standalone/ conf/examples/512MB/standalone/ core/ core/src/main/java/org/apache...
Date Mon, 25 Jun 2012 17:09:39 GMT
Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/EmbeddedWebServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/EmbeddedWebServer.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/EmbeddedWebServer.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/EmbeddedWebServer.java
Mon Jun 25 17:09:31 2012
@@ -16,29 +16,25 @@
  */
 package org.apache.accumulo.server.util;
 
-import java.lang.reflect.Method;
-
 import javax.servlet.http.HttpServlet;
 
-// Work very hard to make this jetty stuff work with Hadoop 0.20 and 0.19.0 which changed
-// the version of jetty from 5.1.4 to 6.1.14.
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.server.monitor.Monitor;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.handler.ContextHandlerCollection;
+import org.mortbay.jetty.security.SslSocketConnector;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.SessionHandler;
 
 public class EmbeddedWebServer {
   
   public static EmbeddedWebServer create(int port) throws ClassNotFoundException {
-    try {
-      return new EmbeddedWebServer5_1(port);
-    } catch (ClassNotFoundException ex) {
-      return new EmbeddedWebServer6_1(port);
-    }
+    return new EmbeddedWebServer6_1(port);
   }
   
   public static EmbeddedWebServer create() throws ClassNotFoundException {
-    try {
-      return new EmbeddedWebServer5_1();
-    } catch (ClassNotFoundException ex) {
-      return new EmbeddedWebServer6_1();
-    }
+    return new EmbeddedWebServer6_1();
   }
   
   public void addServlet(Class<? extends HttpServlet> klass, String where) {}
@@ -51,61 +47,57 @@ public class EmbeddedWebServer {
   
   public void stop() {}
   
+  public boolean isUsingSsl() {
+    return false;
+  }
+  
   static public class EmbeddedWebServer6_1 extends EmbeddedWebServer {
     // 6.1
-    Object server = null;
-    Object sock;
-    Object handler;
+    Server server = null;
+    SocketConnector sock;
+    ContextHandlerCollection handler;
+    Context root;
+    boolean usingSsl;
     
     public EmbeddedWebServer6_1() throws ClassNotFoundException {
       this(0);
     }
     
-    public EmbeddedWebServer6_1(int port) throws ClassNotFoundException {
-      // Works for both
-      try {
-        ClassLoader loader = this.getClass().getClassLoader();
-        server = loader.loadClass("org.mortbay.jetty.Server").getConstructor().newInstance();
-        sock = loader.loadClass("org.mortbay.jetty.bio.SocketConnector").getConstructor().newInstance();
-        handler = loader.loadClass("org.mortbay.jetty.servlet.ServletHandler").getConstructor().newInstance();
-        Method method = sock.getClass().getMethod("setPort", Integer.TYPE);
-        method.invoke(sock, port);
-      } catch (ClassNotFoundException ex) {
-        throw ex;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
+    public EmbeddedWebServer6_1(int port) {
+      server = new Server();
+      handler = new ContextHandlerCollection();
+      root = new Context(handler, "/", new SessionHandler(), null, null, null);
+      
+      if (Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTORE) == ""
+          || Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTOREPASS) == ""
+          || Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTORE) == ""
+          || Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTOREPASS) ==
"") {
+        sock = new SocketConnector();
+        usingSsl = false;
+      } else {
+        sock = new SslSocketConnector();
+        ((SslSocketConnector) sock).setKeystore(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTORE));
+        ((SslSocketConnector) sock).setKeyPassword(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTOREPASS));
+        ((SslSocketConnector) sock).setTruststore(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTORE));
+        ((SslSocketConnector) sock).setTrustPassword(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTOREPASS));
+        usingSsl = true;
       }
+      sock.setPort(port);
     }
     
     public void addServlet(Class<? extends HttpServlet> klass, String where) {
-      try {
-        Method method = handler.getClass().getMethod("addServletWithMapping", klass.getClass(),
where.getClass());
-        method.invoke(handler, klass, where);
-      } catch (Exception ex) {
-        throw new RuntimeException(ex);
-      }
+      root.addServlet(klass, where);
     }
     
     public int getPort() {
-      try {
-        
-        Method method = sock.getClass().getMethod("getLocalPort");
-        return (Integer) method.invoke(sock);
-      } catch (Exception ex) {
-        throw new RuntimeException(ex);
-      }
+      return sock.getLocalPort();
     }
     
     public void start() {
       try {
-        Class<?> klass = server.getClass().getClassLoader().loadClass("org.mortbay.jetty.Connector");
-        Method method = server.getClass().getMethod("addConnector", klass);
-        method.invoke(server, sock);
-        klass = server.getClass().getClassLoader().loadClass("org.mortbay.jetty.Handler");
-        method = server.getClass().getMethod("setHandler", klass);
-        method.invoke(server, handler);
-        method = server.getClass().getMethod("start");
-        method.invoke(server);
+        server.addConnector(sock);
+        server.setHandler(handler);
+        server.start();
       } catch (Exception e) {
         stop();
         throw new RuntimeException(e);
@@ -114,81 +106,14 @@ public class EmbeddedWebServer {
     
     public void stop() {
       try {
-        Method method = server.getClass().getMethod("stop");
-        method.invoke(server);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-  
-  static public class EmbeddedWebServer5_1 extends EmbeddedWebServer {
-    Object sock;
-    Object server = null;
-    
-    public EmbeddedWebServer5_1() throws ClassNotFoundException {
-      this(0);
-    }
-    
-    public EmbeddedWebServer5_1(int port) throws ClassNotFoundException {
-      Method method;
-      try {
-        ClassLoader loader = this.getClass().getClassLoader();
-        server = loader.loadClass("org.mortbay.jetty.Server").getConstructor().newInstance();
-        sock = loader.loadClass("org.mortbay.http.SocketListener").getConstructor().newInstance();
-        method = sock.getClass().getMethod("setPort", Integer.TYPE);
-        method.invoke(sock, port);
-      } catch (ClassNotFoundException ex) {
-        throw ex;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-      
-    }
-    
-    public void addServlet(Class<? extends HttpServlet> klass, String where) {
-      try {
-        Method method = server.getClass().getMethod("getContext", String.class);
-        Object ctx = method.invoke(server, "/");
-        method = ctx.getClass().getMethod("addServlet", String.class, String.class, String.class);
-        method.invoke(ctx, where, where, klass.getName());
-        Class<?> httpContextClass = this.getClass().getClassLoader().loadClass("org.mortbay.http.HttpContext");
-        method = server.getClass().getMethod("addContext", httpContextClass);
-        method.invoke(server, ctx);
-      } catch (Exception ex) {
-        throw new RuntimeException(ex);
-      }
-    }
-    
-    public int getPort() {
-      try {
-        Method method = sock.getClass().getMethod("getPort");
-        return (Integer) method.invoke(sock);
+        server.stop();
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
     }
     
-    public void start() {
-      try {
-        Class<?> listener = getClass().getClassLoader().loadClass("org.mortbay.http.HttpListener");
-        Method method = server.getClass().getMethod("addListener", listener);
-        method.invoke(server, sock);
-        method = server.getClass().getMethod("start");
-        method.invoke(server);
-      } catch (Exception e) {
-        stop();
-        throw new RuntimeException(e);
-      }
-    }
-    
-    public void stop() {
-      try {
-        Method method = server.getClass().getMethod("stop");
-        method.invoke(server);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
+    public boolean isUsingSsl() {
+      return usingSsl;
     }
   }
 }

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Mon Jun 25 17:09:31 2012
@@ -354,7 +354,6 @@ public class Initialize {
     zoo.putPersistentData(zkInstanceRoot + Constants.ZPROBLEMS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZROOT_TABLET, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZROOT_TABLET_WALOGS, new byte[0], NodeExistsPolicy.FAIL);
-    zoo.putPersistentData(zkInstanceRoot + Constants.ZLOGGERS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZTRACERS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTERS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_LOCK, new byte[0], NodeExistsPolicy.FAIL);
@@ -365,6 +364,7 @@ public class Initialize {
     zoo.putPersistentData(zkInstanceRoot + Constants.ZTABLE_LOCKS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZHDFS_RESERVATIONS, new byte[0], NodeExistsPolicy.FAIL);
     zoo.putPersistentData(zkInstanceRoot + Constants.ZNEXT_FILE, new byte[] {'0'}, NodeExistsPolicy.FAIL);
+    zoo.putPersistentData(zkInstanceRoot + Constants.ZRECOVERY, new byte[] {'0'}, NodeExistsPolicy.FAIL);
   }
   
   private static String getInstanceNamePath() throws IOException, KeeperException, InterruptedException
{

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
Mon Jun 25 17:09:31 2012
@@ -35,7 +35,6 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
@@ -67,7 +66,6 @@ import org.apache.accumulo.core.util.Cac
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.StringUtil;
-import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -193,12 +191,12 @@ public class MetadataTable extends org.a
     if (dfv.getNumEntries() > 0) {
       m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(path), new Value(dfv.encode()));
       ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(time.getBytes()));
-      // erase the old location
-      if (lastLocation != null)
-        lastLocation.clearLastLocation(m);
       // stuff in this location
       TServerInstance self = getTServerInstance(address, zooLock);
       self.putLastLocation(m);
+      // erase the old location
+      if (lastLocation != null && !lastLocation.equals(self))
+        lastLocation.clearLastLocation(m);
     }
     if (unusedWalLogs != null) {
       for (String entry : unusedWalLogs) {
@@ -467,11 +465,12 @@ public class MetadataTable extends org.a
     if (compactionId != null)
       ColumnFQ.put(m, Constants.METADATA_COMPACT_COLUMN, new Value(("" + compactionId).getBytes()));
     
-    // remove the old location
-    if (lastLocation != null)
-      lastLocation.clearLastLocation(m);
     TServerInstance self = getTServerInstance(address, zooLock);
     self.putLastLocation(m);
+
+    // remove the old location
+    if (lastLocation != null && !lastLocation.equals(self))
+      lastLocation.clearLastLocation(m);
     
     update(credentials, zooLock, m);
   }
@@ -769,11 +768,7 @@ public class MetadataTable extends org.a
     return ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZROOT_TABLET_WALOGS;
   }
   
-  public static void addLogEntries(AuthInfo credentials, List<LogEntry> entries, ZooLock
zooLock) {
-    if (entries.size() == 0)
-      return;
-    // entries should be a complete log set, so we should only need to write the first entry
-    LogEntry entry = entries.get(0);
+  public static void addLogEntry(AuthInfo credentials, LogEntry entry, ZooLock zooLock) {
     if (entry.extent.isRootTablet()) {
       String root = getZookeeperLogLocation();
       while (true) {

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
Mon Jun 25 17:09:31 2012
@@ -25,18 +25,14 @@ import java.net.UnknownHostException;
 import java.nio.channels.ServerSocketChannel;
 import java.util.Random;
 import java.util.TimerTask;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.util.Daemon;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.SimpleThreadPool;
 import org.apache.accumulo.core.util.TBufferedSocket;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
@@ -205,7 +201,7 @@ public class TServerUtils {
     }
   }
   
-  public static ServerPort startHsHaServer(int port, TProcessor processor, final String serverName,
String threadName, int numThreads,
+  public static ServerPort startHsHaServer(int port, TProcessor processor, final String serverName,
String threadName, final int numThreads,
       long timeBetweenThreadChecks) throws TTransportException {
     TNonblockingServerSocket transport = new TNonblockingServerSocket(port);
     THsHaServer.Args options = new THsHaServer.Args(transport);
@@ -214,21 +210,8 @@ public class TServerUtils {
     /*
      * Create our own very special thread pool.
      */
-    // 1. name the threads for client connections
-    ThreadFactory factory = new ThreadFactory() {
-      AtomicInteger threadId = new AtomicInteger();
-      
-      @Override
-      public Thread newThread(Runnable r) {
-        return new Thread(new LoggingRunnable(log, r), "ClientPool-" + threadId.getAndIncrement());
-      }
-    };
-    // 2. allow tasks to queue, potentially forever
-    final BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
-    // 3. keep the number of threads small
-    final int minimumThreadPoolSize = numThreads;
-    final ThreadPoolExecutor pool = new ThreadPoolExecutor(minimumThreadPoolSize, minimumThreadPoolSize,
10L, TimeUnit.SECONDS, queue, factory);
-    // 4. periodically adjust the number of threads we need by checking how busy our threads
are
+    final ThreadPoolExecutor pool = new SimpleThreadPool(numThreads, "ClientPool");
+    // periodically adjust the number of threads we need by checking how busy our threads
are
     SimpleTimer.getInstance().schedule(new TimerTask() {
       @Override
       public void run() {
@@ -239,7 +222,7 @@ public class TServerUtils {
           pool.setCorePoolSize(larger);
         } else {
           if (pool.getCorePoolSize() > pool.getActiveCount() + 3) {
-            int smaller = Math.max(minimumThreadPoolSize, pool.getCorePoolSize() - 1);
+            int smaller = Math.max(numThreads, pool.getCorePoolSize() - 1);
             if (smaller != pool.getCorePoolSize()) {
               // there is a race condition here... the active count could be higher by the
time
               // we decrease the core pool size... so the active count could end up higher
than

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
Mon Jun 25 17:09:31 2012
@@ -41,7 +41,6 @@ public class ZooZap {
     
     boolean zapMaster = false;
     boolean zapTservers = false;
-    boolean zapLoggers = false;
     boolean zapTracers = false;
     
     if (args.length == 0) {
@@ -54,8 +53,6 @@ public class ZooZap {
         zapTservers = true;
       } else if (args[i].equals("-master")) {
         zapMaster = true;
-      } else if (args[i].equals("-loggers")) {
-        zapLoggers = true;
       } else if (args[i].equals("-tracers")) {
         zapTracers = true;
       } else if (args[i].equals("-verbose")) {
@@ -98,24 +95,19 @@ public class ZooZap {
       }
     }
     
-    if (zapLoggers) {
-      String loggersPath = Constants.ZROOT + "/" + iid + Constants.ZLOGGERS;
-      zapDirectory(zoo, loggersPath);
-    }
-    
     if (zapTracers) {
-      String loggersPath = Constants.ZROOT + "/" + iid + Constants.ZTRACERS;
-      zapDirectory(zoo, loggersPath);
+      String path = Constants.ZROOT + "/" + iid + Constants.ZTRACERS;
+      zapDirectory(zoo, path);
     }
     
   }
   
-  private static void zapDirectory(IZooReaderWriter zoo, String loggersPath) {
+  private static void zapDirectory(IZooReaderWriter zoo, String path) {
     try {
-      List<String> children = zoo.getChildren(loggersPath);
+      List<String> children = zoo.getChildren(path);
       for (String child : children) {
-        message("Deleting " + loggersPath + "/" + child + " from zookeeper");
-        zoo.recursiveDelete(loggersPath + "/" + child, NodeMissingPolicy.SKIP);
+        message("Deleting " + path + "/" + child + " from zookeeper");
+        zoo.recursiveDelete(path + "/" + child, NodeMissingPolicy.SKIP);
       }
     } catch (Exception e) {
       e.printStackTrace();

Modified: accumulo/branches/ACCUMULO-259/server/src/main/resources/web/screen.css
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/resources/web/screen.css?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/resources/web/screen.css (original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/resources/web/screen.css Mon Jun 25 17:09:31
2012
@@ -341,3 +341,48 @@ pre.logevent {
     border: 1px solid #c4c4c4;
     background-color: #ffffff;
 }
+
+#shell {
+    text-align: left;
+    color: #55d839;
+    border: 1px;
+    padding-left: 5px;
+    background-color: #000000;
+    height: 40em;
+    overflow: auto;
+    font-family: Monaco, monospace;
+    font-size: 100%;
+}
+
+#shell span {
+    display: inline;
+}
+
+#shell input {
+    display: inline;
+    border: none;
+    width: 60%;
+    color: #55d839;
+    background-color: #000000;
+    font-family: Monaco, monospace;
+    font-size: 100%;
+}
+
+#shell pre {
+    font-family: Monaco, monospace;
+    font-size: 100%;
+}
+
+#login {
+    text-align: left;
+}
+
+#login table {
+    margin-left: 0;
+    min-width: 0%;
+}
+
+#loginError {
+    text-align: left;
+    color: red;
+}

Propchange: accumulo/branches/ACCUMULO-259/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1341135-1342418,1342420-1343942,1349972,1351425
  Merged /accumulo/branches/1.3/src:r1349971
  Merged /accumulo/trunk:r1342452,1350779
  Merged /accumulo/branches/1.4:r1342421-1343896
  Merged /accumulo/trunk/src:r1343822-1353583
  Merged /accumulo/branches/1.4/src/src:r1342421-1343896,1343899-1343942,1349972,1351425

Modified: accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java
(original)
+++ accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java
Mon Jun 25 17:09:31 2012
@@ -52,8 +52,6 @@ public class Main {
         runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.server.gc.SimpleGarbageCollector");
       } else if (args[0].equals("monitor")) {
         runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.server.monitor.Monitor");
-      } else if (args[0].equals("logger")) {
-        runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.server.logger.LogService");
       } else if (args[0].equals("tracer")) {
         runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.server.trace.TraceServer");
       } else if (args[0].equals("classpath")) {

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/agitator.pl
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/agitator.pl?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/agitator.pl (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/agitator.pl Mon Jun 25 17:09:31
2012
@@ -74,27 +74,8 @@ while(1){
 		$t = strftime "%Y%m%d %H:%M:%S", localtime;
 	
 		$rn = rand(1);
-		$kill_tserver = 0;
-		$kill_logger = 0;
-		if($rn <.33){
-			$kill_tserver = 1;
-			$kill_logger = 1;
-		}elsif($rn < .66){
-			$kill_tserver = 1;
-			$kill_logger = 0;
-		}else{
-			$kill_tserver = 0;
-			$kill_logger = 1;
-		}
-	
-		print STDERR "$t Killing $server $kill_tserver $kill_logger\n";
-	        if($kill_tserver) {
-			system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.*.jar\" tserver KILL");
-		}
-
-	        if($kill_logger) {
-			system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.*.jar\" logger KILL");
-		}
+		print STDERR "$t Killing $server\n";
+		system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.*.jar\" tserver KILL");
 	}
 
 	sleep($sleep2 * 60);

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/continuous-env.sh.example
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/continuous-env.sh.example?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/continuous-env.sh.example (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/continuous-env.sh.example Mon Jun
25 17:09:31 2012
@@ -32,6 +32,9 @@ DEBUG_WALKER=off
 DEBUG_BATCH_WALKER=off
 DEBUG_SCANNER=off
 
+#the number of entries each client should write
+NUM=9223372036854775807
+
 #the minimum random row to generate
 MIN=0
 

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh Mon Jun 25
17:09:31 2012
@@ -24,5 +24,5 @@ if [ "$DEBUG_BATCH_WALKER" = "on" ] ; th
 	DEBUG_OPT="--debug $CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.log";
 fi
 
-pssh -h batch_walkers.txt "nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousBatchWalker
$DEBUG_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $BATCH_WALKER_SLEEP $BATCH_WALKER_BATCH_SIZE
$BATCH_WALKER_THREADS >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.out
2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.err &" < /dev/null
+pssh -h batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousBatchWalker $DEBUG_OPT $INSTANCE_NAME
$ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $BATCH_WALKER_SLEEP $BATCH_WALKER_BATCH_SIZE $BATCH_WALKER_THREADS
>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_batch_walk.err &" < /dev/null
 

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh Mon Jun 25 17:09:31
2012
@@ -24,5 +24,5 @@ if [ "$DEBUG_INGEST" = "on" ] ; then
 	DEBUG_OPT="--debug $CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.log";
 fi
 
-pssh -h ingesters.txt "nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousIngest
$DEBUG_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $MAX_CF $MAX_CQ $MAX_MEM
$MAX_LATENCY $NUM_THREADS $CHECKSUM >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.out
2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.err &" < /dev/null
+pssh -h ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousIngest
$DEBUG_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $NUM $MIN $MAX $MAX_CF $MAX_CQ $MAX_MEM
$MAX_LATENCY $NUM_THREADS $CHECKSUM >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.out
2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_ingest.err &" < /dev/null
 

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh Mon Jun 25 17:09:31
2012
@@ -24,5 +24,5 @@ if [ "$DEBUG_SCANNER" = "on" ] ; then
 	DEBUG_OPT="--debug $CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_scanner.log";
 fi
 
-pssh -h scanners.txt "nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousScanner
$DEBUG_SCANNERS $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SCANNER_SLEEP_TIME
$SCANNER_ENTRIES >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_scanner.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_scanner.err &" < /dev/null
+pssh -h scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousScanner
$DEBUG_SCANNERS $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SCANNER_SLEEP_TIME
$SCANNER_ENTRIES >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_scanner.out 2>$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_scanner.err &" < /dev/null
 

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh Mon Jun 25 17:09:31
2012
@@ -18,6 +18,8 @@
 
 . continuous-env.sh
 
+mkdir -p $CONTINUOUS_LOG_DIR
+
 CONFIG_OUT=$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_config.out
 
 cat $ACCUMULO_HOME/conf/accumulo-env.sh > $CONFIG_OUT

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh Mon Jun 25 17:09:31
2012
@@ -24,5 +24,5 @@ if [ "$DEBUG_WALKER" = "on" ] ; then
 	DEBUG_OPT="--debug $CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.log";
 fi
 
-pssh -h walkers.txt "nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk
$DEBUG_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SLEEP_TIME >$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_walk.out 2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.err
&" < /dev/null
+pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk
$DEBUG_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SLEEP_TIME >$CONTINUOUS_LOG_DIR/\`date
+%Y%m%d%H%M%S\`_\`hostname\`_walk.out 2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.err
&" < /dev/null
 



Mime
View raw message