accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1424498 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ server/src/main/java/org/apache/accumulo/server/test/continuous/ test/system/continuous/
Date Thu, 20 Dec 2012 14:48:21 GMT
Author: ecn
Date: Thu Dec 20 14:48:20 2012
New Revision: 1424498

URL: http://svn.apache.org/viewvc?rev=1424498&view=rev
Log:
ACCUMULO-745 fix continuous ingest scripts to work with std cli

Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
    accumulo/trunk/test/system/continuous/run-moru.sh
    accumulo/trunk/test/system/continuous/run-verify.sh
    accumulo/trunk/test/system/continuous/start-batchwalkers.sh
    accumulo/trunk/test/system/continuous/start-ingest.sh
    accumulo/trunk/test/system/continuous/start-scanners.sh
    accumulo/trunk/test/system/continuous/start-stats.sh
    accumulo/trunk/test/system/continuous/start-walkers.sh

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
Thu Dec 20 14:48:20 2012
@@ -16,6 +16,10 @@
  */
 package org.apache.accumulo.core.cli;
 
+import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
+import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
+import org.apache.hadoop.mapreduce.Job;
+
 import com.beust.jcommander.Parameter;
 
 public class ClientOnDefaultTable extends ClientOpts {
@@ -33,4 +37,11 @@ public class ClientOnDefaultTable extend
       return defaultTable;
     return tableName;
   }
+  
+  public void setAccumuloConfigs(Job job) {
+    super.setAccumuloConfigs(job);
+    AccumuloInputFormat.setInputInfo(job.getConfiguration(), user, getPassword(), getTableName(),
auths);
+    AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), user, getPassword(), true,
getTableName());
+  }
+
 }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
Thu Dec 20 14:48:20 2012
@@ -53,10 +53,10 @@ public class ContinuousBatchWalker {
     Authorizations auths = opts.randomAuths.getAuths(r);
 
     Connector conn = opts.getConnector();
-    Scanner scanner = conn.createScanner(opts.tableName, auths);
+    Scanner scanner = conn.createScanner(opts.getTableName(), auths);
     scanner.setBatchSize(opts.scanBatchSize);
     
-    BatchScanner bs = conn.createBatchScanner(opts.tableName, auths, opts.scanThreads);
+    BatchScanner bs = conn.createBatchScanner(opts.getTableName(), auths, opts.scanThreads);
 
     while (true) {
       Set<Text> batch = getBatch(scanner, opts.min, opts.max, opts.scanBatchSize, r);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
Thu Dec 20 14:48:20 2012
@@ -30,7 +30,7 @@ import java.util.zip.Checksum;
 import org.apache.accumulo.cloudtrace.instrument.CountSampler;
 import org.apache.accumulo.cloudtrace.instrument.Trace;
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.server.cli.ClientOpts;
+import org.apache.accumulo.core.cli.ClientOnDefaultTable;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -54,7 +54,7 @@ import com.beust.jcommander.Parameter;
 
 public class ContinuousIngest {
   
-  static public class BaseOpts extends ClientOpts {
+  static public class BaseOpts extends ClientOnDefaultTable {
     public class DebugConverter implements IStringConverter<String> {
       @Override
       public String convert(String debugLog) {
@@ -78,19 +78,25 @@ public class ContinuousIngest {
     
     @Parameter(names="--debugLog", description="file to write debugging output", converter=DebugConverter.class)
     String debugLog = null;
-    
-    @Parameter(names="--table", description="table to use")
-    String tableName="ci";
+
+    BaseOpts() { super("ci"); }
+  }
+  
+  public static class ShortConverter implements IStringConverter<Short> {
+    @Override
+    public Short convert(String value) {
+      return Short.valueOf(value);
+    }
   }
   
   static public class Opts extends BaseOpts {
     @Parameter(names="--num", description="the number of entries to ingest")
     long num = Long.MAX_VALUE;
     
-    @Parameter(names="--maxColF", description="maximum column family value to use")
+    @Parameter(names="--maxColF", description="maximum column family value to use", converter=ShortConverter.class)
     short maxColF = Short.MAX_VALUE;
     
-    @Parameter(names="--maxColQ", description="maximum column qualifier value to use")
+    @Parameter(names="--maxColQ", description="maximum column qualifier value to use", converter=ShortConverter.class)
     short maxColQ = Short.MAX_VALUE;
  
     @Parameter(names="--addCheckSum", description="turn on checksums")
@@ -140,12 +146,12 @@ public class ContinuousIngest {
     }
     Connector conn = opts.getConnector();
     
-    if (!conn.tableOperations().exists(opts.tableName))
+    if (!conn.tableOperations().exists(opts.getTableName()))
       try {
-        conn.tableOperations().create(opts.tableName);
+        conn.tableOperations().create(opts.getTableName());
       } catch (TableExistsException tee) {}
 
-    BatchWriter bw = conn.createBatchWriter(opts.tableName, opts.getBatchWriterConfig());
+    BatchWriter bw = conn.createBatchWriter(opts.getTableName(), opts.getBatchWriterConfig());
     bw = Trace.wrapAll(bw, new CountSampler(1024));
     
     Random r = new Random();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
Thu Dec 20 14:48:20 2012
@@ -134,7 +134,7 @@ public class ContinuousMoru extends Conf
     
     // set up ranges
     try {
-      Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.tableName,
new Range(), opts.maxMaps);
+      Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.getTableName(),
new Range(), opts.maxMaps);
       AccumuloInputFormat.setRanges(job.getConfiguration(), ranges);
       AccumuloInputFormat.disableAutoAdjustRanges(job.getConfiguration());
     } catch (Exception e) {

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
Thu Dec 20 14:48:20 2012
@@ -41,7 +41,7 @@ public class ContinuousQuery {
     opts.parseArgs(ContinuousQuery.class.getName(), args);
     
     Connector conn = opts.getConnector();
-    Scanner scanner = conn.createScanner(opts.tableName, opts.auths);
+    Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
     scanner.setBatchSize(opts.scanBatchSize);
     
     Random r = new Random();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
Thu Dec 20 14:48:20 2012
@@ -49,7 +49,7 @@ public class ContinuousScanner {
     
     Connector conn = opts.getConnector();
     Authorizations auths = opts.randomAuths.getAuths(r);
-    Scanner scanner = conn.createScanner(opts.tableName, auths);
+    Scanner scanner = conn.createScanner(opts.getTableName(), auths);
     scanner.setBatchSize(opts.scanBatchSize);
     
     double delta = Math.min(.05, .05 / (opts.numToScan / 1000.0));

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
Thu Dec 20 14:48:20 2012
@@ -23,7 +23,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.accumulo.server.cli.ClientOpts;
+import org.apache.accumulo.core.cli.ClientOnDefaultTable;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
@@ -135,10 +135,7 @@ public class ContinuousVerify extends Co
     }
   }
   
-  static class Opts extends ClientOpts {
-    @Parameter(names="--table", description="table to verify")
-    String tableName = "ci";
-    
+  static class Opts extends ClientOnDefaultTable {
     @Parameter(names="--output", description="location in HDFS to store the results; must
not exist", required=true)
     String outputDir = "/tmp/continuousVerify";
     
@@ -150,6 +147,8 @@ public class ContinuousVerify extends Co
     
     @Parameter(names="--offline", description="perform the verification directly on the files
while the table is offline")
     boolean scanOffline = false;
+    
+    public Opts() { super("ci"); }
   }
   
   @Override
@@ -160,13 +159,13 @@ public class ContinuousVerify extends Co
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     
-    String clone = opts.tableName;
+    String clone = opts.getTableName();
     Connector conn = null;
     if (opts.scanOffline) {
       Random random = new Random();
-      clone = opts.tableName + "_" + String.format("%016x", Math.abs(random.nextLong()));
+      clone = opts.getTableName() + "_" + String.format("%016x", Math.abs(random.nextLong()));
       conn = opts.getConnector();
-      conn.tableOperations().clone(opts.tableName, clone, true, new HashMap<String,String>(),
new HashSet<String>());
+      conn.tableOperations().clone(opts.getTableName(), clone, true, new HashMap<String,String>(),
new HashSet<String>());
       conn.tableOperations().offline(clone);
     }
 
@@ -177,7 +176,7 @@ public class ContinuousVerify extends Co
 
     // set up ranges
     try {
-      Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.tableName,
new Range(), opts.maxMaps);
+      Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.getTableName(),
new Range(), opts.maxMaps);
       AccumuloInputFormat.setRanges(job.getConfiguration(), ranges);
       AccumuloInputFormat.disableAutoAdjustRanges(job.getConfiguration());
     } catch (Exception e) {

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
Thu Dec 20 14:48:20 2012
@@ -113,7 +113,7 @@ public class ContinuousWalk {
     ArrayList<Value> values = new ArrayList<Value>();
     
     while (true) {
-      Scanner scanner = conn.createScanner(opts.tableName, opts.randomAuths.getAuths(r));
+      Scanner scanner = conn.createScanner(opts.getTableName(), opts.randomAuths.getAuths(r));
       String row = findAStartRow(opts.min, opts.max, scanner, r);
       
       while (row != null) {

Modified: accumulo/trunk/test/system/continuous/run-moru.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/run-moru.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/run-moru.sh (original)
+++ accumulo/trunk/test/system/continuous/run-moru.sh Thu Dec 20 14:48:20 2012
@@ -18,5 +18,5 @@
 
 . mapred-setup.sh
 
-$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.server.test.continuous.ContinuousMoru
-libjars "$SERVER_LIBJAR" -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --min
$MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency
$MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers $VERIFY_MAX_MAPS
+$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.server.test.continuous.ContinuousMoru
-libjars "$SERVER_LIBJAR" -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE
--min $MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency
$MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers $VERIFY_MAX_MAPS
 

Modified: accumulo/trunk/test/system/continuous/run-verify.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/run-verify.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/run-verify.sh (original)
+++ accumulo/trunk/test/system/continuous/run-verify.sh Thu Dec 20 14:48:20 2012
@@ -24,9 +24,8 @@ if [ -n "$VERIFY_AUTHS" ] ; then
 	AUTH_OPT="--auths $VERIFY_AUTHS";
 fi
 SCAN_OPT=--offline
-if [ "$SCAN_OFFLINE" == "false" ] then
+if [ "$SCAN_OFFLINE" == "false" ] ; then
        SCAN_OPT=
 fi
 
-$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.server.test.continuous.ContinuousVerify
-libjars "$SERVER_LIBJAR" $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t
$TABLE --output $VERFIY_OUT --maxMappers $VERIFY_MAX_MAPS --reduces $VERIFY_REDUCERS $SCAN_OPT
-
+$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.server.test.continuous.ContinuousVerify
-libjars "$SERVER_LIBJAR" $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table
$TABLE --output $VERFIY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS $SCAN_OPT

Modified: accumulo/trunk/test/system/continuous/start-batchwalkers.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-batchwalkers.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/start-batchwalkers.sh (original)
+++ accumulo/trunk/test/system/continuous/start-batchwalkers.sh Thu Dec 20 14:48:20 2012
@@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h batch_walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo
org.apache.accumulo.server.test.continuous.ContinuousBatchWalker $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME
-z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --min $MIN --max $MAX --sleep $BATCH_WALKER_SLEEP
--numToScan $BATCH_WALKER_BATCH_SIZE --batchThreads $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 $AUTH_OPT -i $INSTANCE_NAME
-z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN --max $MAX --sleep $BATCH_WALKER_SLEEP
--numToScan $BATCH_WALKER_BATCH_SIZE --batchThreads $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/trunk/test/system/continuous/start-ingest.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-ingest.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/start-ingest.sh (original)
+++ accumulo/trunk/test/system/continuous/start-ingest.sh Thu Dec 20 14:48:20 2012
@@ -33,5 +33,5 @@ if [ "$CHECKSUM" == "false" ] ; then
         CHECSUM_OPT=
 fi
 
-pssh -h ingesters.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousIngest
$DEBUG_OPT $VIS_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --num $NUM
--min $MIN --max $MAX --minColF $MAX_CF --minColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency
$MAX_LATENCY --batchThreads $NUM_THREADS $CHECKSUM_OPT >$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 $VIS_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --num
$NUM --min $MIN --max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM --batchLatency
$MAX_LATENCY --batchThreads $NUM_THREADS $CHECKSUM_OPT >$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/trunk/test/system/continuous/start-scanners.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-scanners.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/start-scanners.sh (original)
+++ accumulo/trunk/test/system/continuous/start-scanners.sh Thu Dec 20 14:48:20 2012
@@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h scanners.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousScanner
$DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --min $MIN
--max $MAX --sleep $SCANNER_SLEEP_TIME --numToScan $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_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min
$MIN --max $MAX --sleep $SCANNER_SLEEP_TIME --numToScan $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/trunk/test/system/continuous/start-stats.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-stats.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/start-stats.sh (original)
+++ accumulo/trunk/test/system/continuous/start-stats.sh Thu Dec 20 14:48:20 2012
@@ -34,5 +34,5 @@ echo "`wc -l scanners.txt`" >> $CONFIG_O
 echo "`wc -l batch_walkers.txt`" >> $CONFIG_OUT
 
 
-nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousStatsCollector
-t $TABLE -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS >$CONTINUOUS_LOG_DIR/`date
+%Y%m%d%H%M%S`_`hostname`_stats.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_stats.err
&
+nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousStatsCollector
--table $TABLE -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS >$CONTINUOUS_LOG_DIR/`date
+%Y%m%d%H%M%S`_`hostname`_stats.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_stats.err
&
 

Modified: accumulo/trunk/test/system/continuous/start-walkers.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-walkers.sh?rev=1424498&r1=1424497&r2=1424498&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/start-walkers.sh (original)
+++ accumulo/trunk/test/system/continuous/start-walkers.sh Thu Dec 20 14:48:20 2012
@@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then
 fi
 
 
-pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk
$DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --min $MIN
--max $MAX --sleep $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 $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min
$MIN --max $MAX --sleep $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