accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1433166 [19/20] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/ assemble/scripts/ assemble/scripts/init.d/ bin/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ c...
Date Mon, 14 Jan 2013 22:03:34 GMT
Modified: accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py Mon Jan 14 22:03:24 2013
@@ -41,15 +41,26 @@ FUZZ=os.getpid() % 997
 ACCUMULO_HOME = os.path.dirname(__file__)
 ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
 ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
-ACCUMULO_DIR = "/user/" + os.getlogin() + "/accumulo-" + ID
+ACCUMULO_DIR = "/user/" + os.getenv('LOGNAME') + "/accumulo-" + ID
 SITE = "test-" + ID
 
 WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
 LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
 LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
 LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
-General_CLASSPATH = ("$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,"
-"$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar") 
+General_CLASSPATH = """
+$ACCUMULO_HOME/server/target/classes/,
+    $ACCUMULO_HOME/core/target/classes/,
+    $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/examples/instamo/target/classes,
+    $ACCUMULO_HOME/examples/simple/target/classes,
+        $ACCUMULO_HOME/lib/[^.].*.jar,
+        $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+        $HADOOP_CONF_DIR,
+        $HADOOP_PREFIX/[^.].*.jar,
+        $HADOOP_PREFIX/lib/[^.].*.jar,
+"""
 
 log = logging.getLogger('test.auto')
 
@@ -97,8 +108,8 @@ class TestUtilsMixin:
     def runOn(self, host, cmd, **opts):
         cmd = map(str, cmd)
         log.debug('%s: %s', host, ' '.join(cmd))
-        if host == 'localhost':
-            os.environ['ACCUMULO_TSERVER_OPTS']='-Xmx700m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 '
+        if host == 'localhost' or host == socket.getfqdn():
+            os.environ['ACCUMULO_TSERVER_OPTS']='-Xmx800m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 '
             os.environ['ACCUMULO_GENERAL_OPTS']=('-Dorg.apache.accumulo.config.file=%s' % (SITE))
             os.environ['ACCUMULO_LOG_DIR']= ACCUMULO_HOME + '/logs/' + ID
             return Popen(cmd, stdout=PIPE, stderr=PIPE, **opts)
@@ -155,7 +166,7 @@ class TestUtilsMixin:
 
 
     def pkill(self, host, pattern, signal=signal.SIGKILL):
-        cmd = [os.path.join(ACCUMULO_HOME, 'test', 'system', 'auto', 'pkill.sh'), str(signal), str(os.getuid()), ID + '.*' + pattern]
+        cmd = [os.path.join(ACCUMULO_HOME, 'test', 'system', 'auto', 'pkill.sh'), str(signal), str(os.getuid()), pattern + '.*' + ID]
         handle = self.runOn(host, cmd)
         handle.communicate()
 
@@ -187,7 +198,7 @@ class TestUtilsMixin:
         self.cleanupAccumuloHandles(0.5)
 
     def stop_monitor(self, host):
-        self.pkill(host, 'Main monitor$', signal=signal.SIGHUP)
+        self.pkill(host, 'app=monitor', signal=signal.SIGHUP)
         # wait for it to stop
         self.sleep(0.5)
         self.cleanupAccumuloHandles(0.5)
@@ -208,24 +219,24 @@ class TestUtilsMixin:
         klass = 'org.apache.accumulo.server.test.TestIngest'
         args = ''
         if timestamp:
-            args += "-timestamp %ld " % int(timestamp)
-        args += '-tsbw -size %d -random 56 %d %d 1 ' % (size, count, start)
+            args += "-ts %ld " % int(timestamp)
+        args += '--debug -i %s -u %s --size %d --random 56 --rows %d --start %d --cols 1 --createTable ' % (INSTANCE_NAME, ROOT, size, count, start)
         if colf:
-           args = '-colf %s ' % colf + args
+           args = '--columnFamily %s ' % colf + args
         return self.runClassOn(host, klass, args.split(), **kwargs)
 
     def verify(self, host, count, start=0, size=50, timestamp=None, colf='colf'):
         klass = 'org.apache.accumulo.server.test.VerifyIngest'
         args = ''
         if timestamp:
-            args += "-timestamp %ld " % int(timestamp)
-        args += '-size %d -random 56 -colf %s %d %d 1 ' % (size, colf, count, start)
+            args += "-ts %ld " % int(timestamp)
+        args += '-i %s -u %s --size %d --random 56 -cf %s --rows %d --start %d --cols 1 ' % (INSTANCE_NAME, ROOT, size, colf, count, start)
         return self.runClassOn(host, klass, args.split())
 
     def stop_accumulo(self, signal=signal.SIGHUP):
         log.info('killing accumulo processes everywhere')
         for host in self.hosts:
-            self.pkill(host, 'org.apache.accumulo.start', signal)
+            self.pkill(host, 'accumulo.config.file', signal)
 
     def create_config_file(self, settings):
         fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
@@ -367,6 +378,10 @@ class TestUtilsMixin:
         if not handles:
            if handle.returncode is None:
               handle.communicate()
+	   if handle.stdout:
+	      handle.stdout.close()
+	   if handle.stderr:
+              handle.stderr.close()
            self.assert_(self.processResult(out, err, handle.returncode))
            return out, err
         self.fail("Process failed to finish in %s seconds" % secs)
@@ -380,17 +395,20 @@ class TestUtilsMixin:
         self.cleanupAccumuloHandles()
         # give everyone a couple seconds to completely stop
         for h in self.accumuloHandles:
-            self.waitForStop(h, 60)
+            self.waitForStop(h, 10)
 
     def clean_logging(self):
       LOG_PROPERTIES_BACKUP='%s.bkp' % LOG_PROPERTIES 
       LOG_GENERIC_BACKUP='%s.bkp' % LOG_GENERIC
       LOG_MONITOR_BACKUP='%s.bkp' % LOG_MONITOR
-      os.remove(LOG_PROPERTIES)
-      os.remove(LOG_GENERIC)
-      os.remove(LOG_MONITOR)
+      if os.path.exists(LOG_PROPERTIES):
+         os.remove(LOG_PROPERTIES)
+      if os.path.exists(LOG_GENERIC):
+         os.remove(LOG_GENERIC)
+      if os.path.exists(LOG_MONITOR):
+         os.remove(LOG_MONITOR)
       if os.path.exists(LOG_PROPERTIES_BACKUP):
-        os.rename(LOG_PROPERTIES_BACKUP, LOG_PROPERTIES)
+         os.rename(LOG_PROPERTIES_BACKUP, LOG_PROPERTIES)
       if os.path.exists(LOG_GENERIC_BACKUP):
          os.rename(LOG_GENERIC_BACKUP, LOG_GENERIC)
       if os.path.exists(LOG_MONITOR_BACKUP):
@@ -413,7 +431,7 @@ class TestUtilsMixin:
                                ['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
           self.wait(self.runClassOn(self.masterHost(),
                                     'org.apache.accumulo.server.util.DeleteZooInstance',
-                                    [INSTANCE_NAME]))
+                                    ['-i', INSTANCE_NAME]))
           self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
           self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME + '/logs/' + ID]))
           self.clean_logging() 
@@ -432,7 +450,7 @@ class TestUtilsMixin:
     def getTableId(self, table):
         if table == '!METADATA' :
             return '!0'
-        handle = self.runClassOn(self.masterHost(), 'org.apache.accumulo.server.test.ListTables',[]);
+        handle = self.runClassOn(self.masterHost(), 'org.apache.accumulo.server.test.ListTables',['-u', ROOT]);
         out,err = handle.communicate()
         self.assert_(handle.returncode==0)
         for line in out.split('\n') :

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/run.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/run.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/run.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/run.py Mon Jan 14 22:03:24 2013
@@ -23,6 +23,7 @@ import unittest
 import glob
 import re
 import sys
+import socket
 from subprocess import Popen, PIPE
 
 from TestUtils import ACCUMULO_HOME, ACCUMULO_DIR
@@ -49,7 +50,7 @@ def parseArguments(parser, allTests):
         if hasattr(test, 'add_options'):
             test.add_options(parser)
     options, hosts = parser.parse_args()
-    options.hosts = hosts or ['localhost']
+    options.hosts = hosts or [socket.getfqdn()]
     return options
 
 def testName(test):

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/binary.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/binary.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/binary.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/binary.py Mon Jan 14 22:03:24 2013
@@ -32,8 +32,11 @@ class BinaryTest(unittest.TestCase, Test
         
         # initialize the database
         self.createTable("bt")
-    def test(self, *args):
-        handle = self.runClassOn(self.masterHost(), testClass, list(args))
+    def test(self, mode, table, min, max):
+        handle = self.runClassOn(self.masterHost(), testClass, 
+                                 ['-u', 'root',
+                                  '--mode', mode, '-t', table, 
+                                  '--start', min, '--count', max])
         self.waitForStop(handle, 200)
         
     def tearDown(self):
@@ -49,7 +52,6 @@ class BinaryTest(unittest.TestCase, Test
         self.test("verify","bt","75000","25000")
         self.test("randomLookups","bt","75000","25000")
         self.test("verifyDeleted","bt","25000","50000")
-        self.shutdown_accumulo()
 
 class BinaryPreSplitTest(BinaryTest):
     "Test inserting binary data into accumulo with a presplit table (this will place binary data in !METADATA)"

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/bulk.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/bulk.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/bulk.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/bulk.py Mon Jan 14 22:03:24 2013
@@ -19,7 +19,7 @@ import logging
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD
+from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD, INSTANCE_NAME
 
 log = logging.getLogger('test.auto')
 
@@ -41,14 +41,14 @@ class SimpleBulkTest(TestUtilsMixin, uni
         handle = self.runClassOn(
             self.masterHost(),
             'org.apache.accumulo.server.test.BulkImportDirectory',
-            [ROOT, ROOT_PASSWORD,
-             'test_ingest', dir, '/testBulkFail'])
+            ['-u', ROOT, '-p', ROOT_PASSWORD,
+             '-t', 'test_ingest', '--source', dir, '--failures', '/testBulkFail', '-i', INSTANCE_NAME])
         self.wait(handle)
         self.assert_(handle.returncode == 0)
         
 
     def createRFiles(self):
-        args = '-rFile /testrf/rf%02d -timestamp 1 -size 50 -random 56 %1d %ld 1'
+        args = '--rfile /testrf/rf%02d --timestamp 1 --size 50 --random 56 --rows %1d --start %ld --cols 1 -u root -i ' + INSTANCE_NAME
         log.info('creating rfiles')
         handles = []
         for i in range(COUNT):

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/compaction.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/compaction.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/compaction.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/compaction.py Mon Jan 14 22:03:24 2013
@@ -44,7 +44,7 @@ class CompactionTest(SimpleBulkTest):
         handle = self.runClassOn(
             self.masterHost(),
             'org.apache.accumulo.server.test.CreateRFiles',
-            "testrf 4 0 500000 59".split())
+            "--output testrf --numThreads 4 --start 0 --end 500000 --splits 59".split())
         out, err = handle.communicate()
         self.assert_(handle.returncode == 0)
 

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/delete.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/delete.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/delete.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/delete.py Mon Jan 14 22:03:24 2013
@@ -19,7 +19,7 @@ import logging
 import unittest
 import time
 
-from TestUtils import TestUtilsMixin
+from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD, INSTANCE_NAME, ZOOKEEPERS
 
 log = logging.getLogger('test.auto')
 
@@ -47,7 +47,7 @@ class DeleteTest(readwrite.SunnyDayTest)
         self.waitForStop(self.ingester, 200)
 
         log.info("Deleting data")
-        self.waitForStop(self.runClassOn(self.masterHost(), "org.apache.accumulo.server.test.TestRandomDeletes", []),
+        self.waitForStop(self.runClassOn(self.masterHost(), "org.apache.accumulo.server.test.TestRandomDeletes", ['-u', ROOT, '-p', ROOT_PASSWORD, '-i', INSTANCE_NAME, '-z', ZOOKEEPERS]),
                          400)
 
         log.info("Inserting data")

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/deleterows.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/deleterows.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/deleterows.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/deleterows.py Mon Jan 14 22:03:24 2013
@@ -26,7 +26,7 @@ class DeleteRowsTest(JavaTest):
 class DeleteRowsSplitTest(JavaTest):
     "Test Delete Rows Split"
 
-    maxRuntime = 180
+    maxRuntime = 300
     order = 92
     testClass="org.apache.accumulo.server.test.functional.DeleteRowsSplitTest"
 

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamic.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamic.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamic.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamic.py Mon Jan 14 22:03:24 2013
@@ -41,40 +41,48 @@ class DynamicClassloader(AggregationTest
         #Make sure paths exists for test
         if not os.path.exists(os.path.join(ACCUMULO_HOME, 'target','dynamictest%s' % rand, 'accumulo','test')):
           os.makedirs(os.path.join(ACCUMULO_HOME, 'target', 'dynamictest%s' % rand, 'accumulo', 'test'))
-        fp = open(os.path.join(ACCUMULO_HOME, 'target', 'dynamictest%s' % rand, 'accumulo', 'test', 'StringSummation%s.java' % rand), 'wb')
+        fp = open(os.path.join(ACCUMULO_HOME, 'target', 'dynamictest%s' % rand, 'accumulo', 'test', 'SummingCombiner%s.java' % rand), 'wb')
         fp.write('''
 package accumulo.test;
 
-import org.apache.accumulo.core.data.Value;
-
-public class StringSummation%s implements org.apache.accumulo.core.iterators.aggregation.Aggregator {
-
-	long sum = 0;
-	
-	public Value aggregate() {
-		return new Value(Long.toString(sum).getBytes());
-	}
-
-	public void collect(Value value) {
-		sum += Long.parseLong(new String(value.get()));
-	}
-
-	public void reset() {
-		sum = 0;
-		
-	}
+import java.util.Iterator;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.iterators.LongCombiner;
+
+public class SummingCombiner%s extends LongCombiner {
+  @Override
+  public Long typedReduce(Key key, Iterator<Long> iter) {
+    long sum = 0;
+    while (iter.hasNext()) {
+      sum = safeAdd(sum, iter.next());
+    }
+    return sum;
+  }
+  
+  @Override
+  public IteratorOptions describeOptions() {
+    IteratorOptions io = super.describeOptions();
+    io.setName("sum");
+    io.setDescription("SummingCombiner interprets Values as Longs and adds them together.  A variety of encodings (variable length, fixed length, or string) are available");
+    return io;
+  }
 }
 ''' % rand)
         fp.close()
 
         handle = self.runOn(self.masterHost(), [self.accumulo_sh(), 'classpath'])
         out, err = handle.communicate()
-        path = ':'.join(out.split('\n')[1:])
+	parts = []
+        for line in out.split('\n'):
+           line = line.strip()
+	   if line.startswith("file:"):
+              parts.append(line[5:])
+        path = ':'.join(parts)
 
         self.runWait("javac -cp %s:%s %s" % (
             path,
             os.path.join(ACCUMULO_HOME,'src','core','target','classes'),
-            os.path.join(ACCUMULO_HOME,'target','dynamictest%s' % rand,'accumulo','test','StringSummation%s.java' % rand)
+            os.path.join(ACCUMULO_HOME,'target','dynamictest%s' % rand,'accumulo','test','SummingCombiner%s.java' % rand)
             ))
         self.runWait("jar -cf %s -C %s accumulo/" % (
             os.path.join(ACCUMULO_HOME,'lib','ext','Aggregator%s.jar' % rand),
@@ -84,8 +92,8 @@ public class StringSummation%s implement
         self.sleep(1)
 
         # initialize the database
-        aggregator = 'accumulo.test.StringSummation%s' % rand
-        cmd = 'createtable test\nsetiter -agg -minc -majc -scan -p 10 -t test\ncf ' + aggregator + '\n\n'
+        combiner = 'accumulo.test.SummingCombiner%s' % rand
+        cmd = 'createtable --no-default-iterators test\nsetiter -t test -p 10 -scan -minc -majc -n testcombineriter -class '+ combiner+'\n\ncf\n\nSTRING'
         out, err, code = self.rootShell(self.masterHost(),"%s\n" % cmd)
         self.assert_(code == 0)
 

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamicThreadPools.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamicThreadPools.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamicThreadPools.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/dynamicThreadPools.py Mon Jan 14 22:03:24 2013
@@ -49,7 +49,7 @@ class DynamicThreadPools(SunnyDayTest):
     def runTest(self):
         self.waitForStop(self.ingester, self.waitTime())
         # make a bunch of work for compaction
-        self.shell(self.masterHost(), 
+        out, err, returncode =  self.shell(self.masterHost(), 
 		   'clonetable test_ingest test_ingest1\n'
 		   'clonetable test_ingest test_ingest2\n'
  		   'clonetable test_ingest test_ingest3\n'
@@ -60,12 +60,14 @@ class DynamicThreadPools(SunnyDayTest):
 		   'sleep 10\n'
 		   'compact -p .*\n'
 		   'sleep 2\n')
-	handle = self.runOn(self.masterHost(), [self.accumulo_sh(), 'org.apache.accumulo.server.test.GetMasterStats'])
-        out, err = self.waitForStop(handle, 120)
+	log.info('shell says: ' + out)
         count = 0
-        for line in out.split('\n'):
-	   if line.find('Major Compacting') >= 0:
-		count += int(line.split()[2])
+	while count == 0:
+	   handle = self.runOn(self.masterHost(), [self.accumulo_sh(), 'org.apache.accumulo.server.test.GetMasterStats', '-u', 'root'])
+           out, err = self.waitForStop(handle, 120)
+           for line in out.split('\n'):
+	      if line.find('Major Compacting') >= 0:
+		 count += int(line.split()[2])
         self.assert_(count == 1)
 
 def suite():

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py Mon Jan 14 22:03:24 2013
@@ -63,7 +63,7 @@ class Examples(TestUtilsMixin, unittest.
 	self.comment("Testing MaxMutation constraint")
 	self.ashell('createtable test_ingest\n'
                     'constraint -a org.apache.accumulo.examples.simple.constraints.MaxMutationSize\n')
-        handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.server.test.TestIngest', '1', '0', '10000'])
+        handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.server.test.TestIngest', '-u', ROOT, '--rows', '1', '--start', '0', '--cols', '10000'])
         out, err = handle.communicate()
         self.failIf(handle.returncode==0)
         self.failUnless(err.find("MutationsRejectedException: # constraint violations : 1") >= 0, "Was able to insert a mutation larger than max size")
@@ -72,17 +72,17 @@ class Examples(TestUtilsMixin, unittest.
         self.comment("Testing dirlist example (a little)")
         self.comment("  ingesting accumulo source")
         self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.Ingest',
-                     INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD,
-                     'dirTable',
-                     'indexTable',
-                     'dataTable',
-                     visibility,
-                     100000,
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD,
+                     '--dirTable', 'dirTable',
+                     '--indexTable', 'indexTable',
+                     '--dataTable', 'dataTable',
+                     '--vis', visibility,
+                     '--chunkSize', 100000,
                      ACCUMULO_HOME+"/fate")
         self.comment("  searching for a file")
         handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
-                                          INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD,
-                                          'indexTable', auths, 'Fate.java', '-search'])
+                                          '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD,
+                                          '-t', 'indexTable', '--auths', auths, '--search', '--path', 'Fate.java'])
         out, err = handle.communicate()
         self.assert_(handle.returncode == 0)
         self.assert_(out.find('accumulo/fate/Fate.java') >= 0)
@@ -103,36 +103,37 @@ class Examples(TestUtilsMixin, unittest.
 
         self.comment("Testing bloom filters are fast for missing data")
         self.ashell('createtable bloom_test\nconfig -t bloom_test -s table.bloom.enabled=true\n')
-        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchWriter', '-s', '7',
-                     INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test',
-                     '1000000', '0', '1000000000', '50', '2000000', '60000', '3', 'A')
+        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchWriter', '--seed', '7',
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD, '-t', 'bloom_test',
+                     '--num', '1000000', '--min', '0', '--max', '1000000000', '--size', '50', '--batchMemory', '2M', '--batchLatency', '60s', 
+                     '--batchThreads', '3')
         self.ashell('flush -t bloom_test -w\n')
         now = time.time()
-        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '-s', '7',
-                     INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test',
-                     500, 0, 1000000000, 50, 20, 'A')
+        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '--seed', '7',
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD, '-t', 'bloom_test',
+                     '--num', '500', '--min', '0', '--max', '1000000000', '--size', '50', '--scanThreads', 4)
         diff = time.time() - now
         now = time.time()
-        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '-s', '8',
-                     INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test',
-                     500, 0, 1000000000, 50, 20, 'A')
+        self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '--seed', '8',
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD, '-t', 'bloom_test',
+                     '--num', '500', '--min', '0', '--max', '1000000000', '--size', '50', '--scanThreads', 4)
         diff2 = time.time() - now
         self.assert_(diff2 < diff)
 
         self.comment("Creating a sharded index of the accumulo java files")
         self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
         self.execute('/bin/sh', '-c',
-                     'find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.simple.examples.shard.Index %s %s shard %s %s 30' %
+                     'find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.simple.examples.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
                      (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
         self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.Query',
-                     INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '-u', ROOT, '-p', ROOT_PASSWORD,
                      'foo', 'bar')
         self.comment("Creating a word index of the sharded files")
         self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.Reverse',
-                     INSTANCE_NAME, ZOOKEEPERS, 'shard', 'doc2term', ROOT, ROOT_PASSWORD)
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '--doc2Term', 'doc2term', '-u', ROOT, '-p', ROOT_PASSWORD)
         self.comment("Making 1000 conjunctive queries of 5 random words")
         self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.ContinuousQuery',
-                     INSTANCE_NAME, ZOOKEEPERS, 'shard', 'doc2term', ROOT, ROOT_PASSWORD, 5, 1000)
+                     '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '--doc2Term', 'doc2term', '-u', ROOT, '-p', ROOT_PASSWORD, '--term', 5, '--count', 1000)
 
         self.execute('hadoop', 'fs', '-rmr', "/tmp/input", "/tmp/files", "/tmp/splits.txt", "/tmp/failures")
         self.execute('hadoop', 'fs', '-mkdir', "/tmp/input")
@@ -155,41 +156,38 @@ class Examples(TestUtilsMixin, unittest.
             ACCUMULO_HOME+'/bin/tool.sh',
             examplesJar,
             'org.apache.accumulo.simple.examples.mapreduce.TeraSortIngest',
-            ROWS,  
-            10, 10,
-            78, 78,
-            'sorted',
-            INSTANCE_NAME,
-            ZOOKEEPERS,
-            ROOT,
-            ROOT_PASSWORD,
-            4]))
+            '--count', ROWS,  
+            '-nk', 10, '-xk', 10,
+            '-nk', 78, '-xk', 78,
+            '-t', 'sorted',
+            '-i', INSTANCE_NAME,
+            '-z', ZOOKEEPERS,
+            '-u', ROOT,
+            '-p', ROOT_PASSWORD,
+            '--splits', 4]))
         self.comment("Looking for '999' in all rows")
         self.wait(self.runOn(self.masterHost(), [
             ACCUMULO_HOME+'/bin/tool.sh',
             examplesJar,
             'org.apache.accumulo.simple.examples.mapreduce.RegexExample',
-            INSTANCE_NAME,
-            ZOOKEEPERS,
-            ROOT,
-            ROOT_PASSWORD,
-            'sorted',
-            '.*999.*',
-            '.*',
-            '.*',
-            '.*',
+            '-i', INSTANCE_NAME,
+            '-z', ZOOKEEPERS,
+            '-u', ROOT,
+            '-p', ROOT_PASSWORD,
+            '-t', 'sorted',
+            '--rowRegex', '.*999.*',
             '/tmp/nines']))
         self.comment("Generating hashes of each row into a new table")
         self.wait(self.runOn(self.masterHost(), [
             ACCUMULO_HOME+'/bin/tool.sh',
             examplesJar,
             'org.apache.accumulo.simple.examples.mapreduce.RowHash',
-            INSTANCE_NAME,
-            ZOOKEEPERS,
-            ROOT,
-            ROOT_PASSWORD,
-            'sorted',
-            ':',
+            '-i', INSTANCE_NAME,
+            '-z', ZOOKEEPERS,
+            '-u', ROOT,
+            '-p', ROOT_PASSWORD,
+            '-t', 'sorted',
+            '--column', ':',
             'sortedHashed',
             ]))
         self.comment("Exporting the table to HDFS")
@@ -197,13 +195,12 @@ class Examples(TestUtilsMixin, unittest.
             ACCUMULO_HOME+'/bin/tool.sh',
             examplesJar,
             'org.apache.accumulo.simple.examples.mapreduce.TableToFile',
-            INSTANCE_NAME,
-            ZOOKEEPERS,
-            ROOT,
-            ROOT_PASSWORD,
-            'sortedHashed',
-            ',',
-            '/tmp/tableFile'
+            '-i', INSTANCE_NAME,
+            '-z', ZOOKEEPERS,
+            '-u', ROOT,
+            '-p', ROOT_PASSWORD,
+            '-t', 'sorted',
+            '--output', '/tmp/tableFile'
             ]))
         self.comment("Running WordCount using Accumulo aggregators")
         self.wait(self.runOn(self.masterHost(), [
@@ -220,50 +217,49 @@ class Examples(TestUtilsMixin, unittest.
             ACCUMULO_HOME+'/bin/tool.sh',
             examplesJar,
             'org.apache.accumulo.simple.examples.mapreduce.WordCount',
-            INSTANCE_NAME,
-            ZOOKEEPERS,
-            '/tmp/wc',
-            'wctable'
+            '-i', INSTANCE_NAME,
+            '-z', ZOOKEEPERS,
+            '--input', '/tmp/wc',
+            '-t', 'wctable'
             ]))
         self.comment("Inserting data with a batch writer")
         self.runExample(['org.apache.accumulo.simple.examples.helloworld.InsertWithBatchWriter',
-                        INSTANCE_NAME,
-                        ZOOKEEPERS,
-                        'helloBatch',
-                        ROOT,
-                        ROOT_PASSWORD])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-t', 'helloBatch',
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD])
         self.comment("Reading data")
         self.runExample(['org.apache.accumulo.simple.examples.helloworld.ReadData',
-                         INSTANCE_NAME,
-                         ZOOKEEPERS,
-                        'helloBatch',
-                         ROOT,
-                         ROOT_PASSWORD])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-t', 'helloBatch',
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD])
         self.comment("Running isolated scans")
         self.runExample(['org.apache.accumulo.simple.examples.isolation.InterferenceTest',
-                         INSTANCE_NAME,
-                         ZOOKEEPERS,
-                         ROOT,
-                         ROOT_PASSWORD,
-                         'itest1',
-                         100000,
-                         'true'])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD,
+                         '-t', 'itest1',
+                         '--iterations', 100000,
+                         '--isolated'])
         self.comment("Running scans without isolation")
         self.runExample(['org.apache.accumulo.simple.examples.isolation.InterferenceTest',
-                         INSTANCE_NAME,
-                         ZOOKEEPERS,
-                         ROOT,
-                         ROOT_PASSWORD,
-                         'itest2',
-                         100000,
-                         'false'])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD,
+                         '-t', 'itest2',
+                         '--iterations', 100000])
         self.comment("Inserting data using a map/reduce job")
         self.runExample(['org.apache.accumulo.simple.examples.helloworld.InsertWithOutputFormat',
-                         INSTANCE_NAME,
-                         ZOOKEEPERS,
-                        'helloOutputFormat',
-                         ROOT,
-                         ROOT_PASSWORD])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-t', 'helloOutputFormat',
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD ])
         self.comment("Using some example constraints")
         self.ashell('\n'.join([
             'createtable testConstraints',
@@ -276,35 +272,35 @@ class Examples(TestUtilsMixin, unittest.
             ]))
         self.comment("Performing some row operations")
         self.runExample(['org.apache.accumulo.simple.examples.client.RowOperations', 
-                           INSTANCE_NAME,
-                           ZOOKEEPERS,
-                           ROOT,
-                           ROOT_PASSWORD])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD ])
         self.comment("Using the batch writer")
         self.runExample(['org.apache.accumulo.simple.examples.client.SequentialBatchWriter',
-                           INSTANCE_NAME, 
-                           ZOOKEEPERS, 
-                           ROOT, 
-                           ROOT_PASSWORD, 
-                           table,
-                           min,
-                           count,
-                           valueSize,
-                           memory,
-                           latency,
-                           numThreads,
-                           visibility])
+                        '-i', INSTANCE_NAME,
+                        '-z', ZOOKEEPERS,
+                        '-u', ROOT,
+                        '-p', ROOT_PASSWORD,
+                         '-t', table,
+                         '--start', min,
+                         '--num', count,
+                         '--size', valueSize,
+                         '--batchMemory', memory,
+                         '--batchLatency', latency,
+                         '--batchThreads', numThreads,
+                         '--vis', visibility])
         self.comment("Reading and writing some data")
         self.runExample(['org.apache.accumulo.simple.examples.client.ReadWriteExample',
                            '-i', INSTANCE_NAME, 
                            '-z', ZOOKEEPERS, 
                            '-u', ROOT, 
                            '-p', ROOT_PASSWORD, 
-                           '-s', auths,
+                           '--auths', auths,
                            '-t', table,
-                           '-e', 
-                           '-r', 
-                           '-dbg'])
+                           '--createtable', 
+                           '-c', 
+                           '--debug'])
         self.comment("Deleting some data")
         self.runExample(['org.apache.accumulo.simple.examples.client.ReadWriteExample',
                            '-i', INSTANCE_NAME, 
@@ -314,42 +310,42 @@ class Examples(TestUtilsMixin, unittest.
                            '-s', auths,
                            '-t', table,
                            '-d', 
-                           '-dbg'])
+                           '--debug'])
         self.comment("Writing some random data with the batch writer")
         self.runExample(['org.apache.accumulo.simple.examples.client.RandomBatchWriter',
-                           INSTANCE_NAME, 
-                           ZOOKEEPERS, 
-                           ROOT, 
-                           ROOT_PASSWORD, 
-                           table,
-                           count, 
-                           min, 
-                           max, 
-                           valueSize, 
-                           memory, 
-                           latency, 
-                           numThreads, 
-                           visibility])
+                           '-i', INSTANCE_NAME, 
+                           '-z', ZOOKEEPERS, 
+                           '-u', ROOT, 
+                           '-p', ROOT_PASSWORD, 
+                           '-t', table,
+                           '--num', count, 
+                           '--min', min, 
+                           '--max', max, 
+                           '--size', valueSize, 
+                           '--batchMemory', memory, 
+                           '--batchLatency', latency, 
+                           '--batchThreads', numThreads, 
+                           '--vis', visibility])
         self.comment("Writing some random data with the batch writer")
         self.runExample(['org.apache.accumulo.simple.examples.client.RandomBatchScanner',
-                           INSTANCE_NAME, 
-                           ZOOKEEPERS, 
-                           ROOT, 
-                           ROOT_PASSWORD, 
-                           table,
-                           count, 
-                           min, 
-                           max, 
-                           valueSize, 
-                           numThreads, 
-                           auths]);
+                           '-i', INSTANCE_NAME, 
+                           '-z', ZOOKEEPERS, 
+                           '-u', ROOT, 
+                           '-p', ROOT_PASSWORD, 
+                           '-t', table,
+                           '--num', count, 
+                           '--min', min, 
+                           '--max', max, 
+                           '--size', valueSize, 
+                           '--scanThreads', numThreads, 
+                           '--auths', auths]);
         self.comment("Running an example table operation (Flush)")
         self.runExample(['org.apache.accumulo.simple.examples.client.Flush',
-                           INSTANCE_NAME,
-                           ZOOKEEPERS,
-                           ROOT,
-                           ROOT_PASSWORD,
-                           table])
+                           '-i', INSTANCE_NAME, 
+                           '-z', ZOOKEEPERS, 
+                           '-u', ROOT, 
+                           '-p', ROOT_PASSWORD, 
+                           '-t', table])
         self.shutdown_accumulo();
 
 

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/gc.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/gc.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/gc.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/gc.py Mon Jan 14 22:03:24 2013
@@ -74,7 +74,7 @@ class GCTest(SunnyDayTest):
                             glob.glob(os.path.join(ACCUMULO_HOME,'logs',ID,'gc_*')))
         out, err = handle.communicate()
         self.assert_(handle.returncode != 0)
-        self.pkill(self.masterHost(), 'java.*Main gc$', signal.SIGHUP)
+        self.pkill(self.masterHost(), 'app=gc', signal.SIGHUP)
         self.wait(gc)
         log.info("Verifying Ingestion")
         self.waitForStop(self.verify(self.masterHost(), self.options.rows),
@@ -86,24 +86,25 @@ class GCLotsOfCandidatesTest(TestUtilsMi
     order = GCTest.order + 1
     settings = SunnyDayTest.settings.copy()
     settings.update({
-        'gc.cycle.start': 5,
-        'gc.cycle.delay': 15
+        'gc.cycle.start': 1,
+        'gc.cycle.delay': 1
         })
 
     def runTest(self):
         self.stop_gc(self.masterHost())
         log.info("Filling !METADATA table with bogus delete flags")
         prep = self.runOn(self.masterHost(),
-                        [self.accumulo_sh(), 'org.apache.accumulo.server.test.GCLotsOfCandidatesTest',
-                         INSTANCE_NAME,ZOOKEEPERS,ROOT,ROOT_PASSWORD])
+                        [self.accumulo_sh(), 
+                         'org.apache.accumulo.server.test.GCLotsOfCandidatesTest',
+                         '-i',INSTANCE_NAME,'-z', ZOOKEEPERS,'-u', ROOT, '-p', ROOT_PASSWORD])
         out, err = prep.communicate()
         self.assert_(prep.returncode == 0)
 
         log.info("Running GC with low memory allotment")
         gc = self.runOn('localhost',
-                        ['bash', '-c', 'ACCUMULO_GC_OPTS="-Xmx7m " ' + self.accumulo_sh() + ' gc'])
-        self.sleep(20)
-        self.pkill('localhost', 'java.*Main gc$', signal.SIGHUP)
+                        ['bash', '-c', 'ACCUMULO_GC_OPTS="-Xmx15m " ' + self.accumulo_sh() + ' gc'])
+        self.sleep(10)
+        self.pkill('localhost', 'app=gc', signal.SIGHUP)
         self.wait(gc)
 
         log.info("Verifying GC ran out of memory and cycled instead of giving up")

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py Mon Jan 14 22:03:24 2013
@@ -48,8 +48,7 @@ class MapReduceTest(TestUtilsMixin,unitt
     """
     order = 21
 
-    input_tablename = "mapredf"
-    output_tablename = "mapredf"
+    tablename = "mapredf"
     input_cfcq = "cf-HASHTYPE:cq-NOTHASHED"
     output_cfcq = "cf-HASHTYPE:cq-MD5BASE64"
     example_class_to_run ="org.apache.accumulo.examples.simple.mapreduce.RowHash"
@@ -70,21 +69,21 @@ class MapReduceTest(TestUtilsMixin,unitt
         core = globa(os.path.join('lib','accumulo-core*[!javadoc|sources].jar'))
         fate = globa(os.path.join('lib','accumulo-fate*[!javadoc|sources].jar'))
         start = globa(os.path.join('lib','accumulo-start*[!javadoc|sources].jar'))
+        jcommander = globa(os.path.join('lib','jcommander*[!javadoc|sources].jar'))
         trace = globa(os.path.join('lib','cloudtrace*[!javadoc|sources].jar'))
         zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*[!javadoc|src|bin].jar")
         self.createInputTableInAccumulo();
         #Arguments for the Example Class
-        arg_list = [TestUtils.INSTANCE_NAME,
-                    TestUtils.ZOOKEEPERS,
-                    TestUtils.ROOT,
-                    TestUtils.ROOT_PASSWORD,
-                    self.input_tablename,
-                    self.input_cfcq,
-                    self.output_tablename]
+        arg_list = ['-i', TestUtils.INSTANCE_NAME,
+                    '-z', TestUtils.ZOOKEEPERS,
+                    '-u', TestUtils.ROOT,
+                    '-p', TestUtils.ROOT_PASSWORD,
+                    '-t', self.tablename,
+                    '--column', self.input_cfcq]
         #MapReduce class to run
         mapred_class= [self.accumulo_sh(),self.example_class_to_run]
         #classes needed to run the mapreduce
-        libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace])]
+        libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace,jcommander])]
         cmd = mapred_class+libjars+arg_list
         if(self.isAccumuloRunning()):
             log.debug("COMMAND:"+str(cmd))
@@ -118,22 +117,22 @@ class MapReduceTest(TestUtilsMixin,unitt
     
     def checkResults(self):
         control_values = [base64.b64encode(hashlib.md5("row%s"%(i)).digest()) for i in range(10)]
-        experiment_values = self.retrieveValues(self.output_tablename, self.output_cfcq)
+        experiment_values = self.retrieveValues(self.tablename, self.output_cfcq)
         self.failIf(len(control_values) != len(experiment_values), "List aren't the same length")
         diff=[ev for ev in experiment_values if ev not in control_values]
         self.failIf(len(diff)>0, "Start and MapReduced Values aren't not the same")
     
     def fakeMRResults(self):
-        vals = self.retrieveValues(self.input_tablename, self.input_cfcq)
+        vals = self.retrieveValues(self.tablename, self.input_cfcq)
         values = ["insert %s %s %s\n" % (i,self.output_cfcq.replace(":"," "),base64.b64encode(hashlib.md5("row%s" % i).digest())) for i in range(10,20)]
-        input = "table %s\n" % (self.input_tablename,)+"".join(values)
+        input = "table %s\n" % (self.tablename,)+"".join(values)
         out,err,code = self.rootShell(self.masterHost(),input)
         #print "FAKE",out
     
     def createInputTableInAccumulo(self):
         #my leet python list comprehensions skills in action
         values = ["insert %s %s row%s\n" % (i,self.input_cfcq.replace(":"," "),i) for i in range(10)]
-        input = "createtable %s\ntable %s\n" % (self.input_tablename,self.input_tablename) + \
+        input = "createtable %s\ntable %s\n" % (self.tablename,self.tablename) + \
                 "".join(values)
         out,err,code = self.rootShell(self.masterHost(),input)
         #print "CREATE",out

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/merge.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/merge.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/merge.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/merge.py Mon Jan 14 22:03:24 2013
@@ -96,6 +96,7 @@ class MergeTest(JavaTest):
 
     order = 92
     testClass="org.apache.accumulo.server.test.functional.MergeTest"
+    maxRuntime = 200
 
 
 def suite():

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/readwrite.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/readwrite.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/readwrite.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/readwrite.py Mon Jan 14 22:03:24 2013
@@ -20,7 +20,7 @@ import unittest
 import time
 import sys
 
-from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE
+from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE, INSTANCE_NAME
 
 log = logging.getLogger('test.auto')
 
@@ -82,12 +82,12 @@ class MultiTableTest(SunnyDayTest):
     
     def ingest(self, host, count, *args, **kwargs):
         klass = 'org.apache.accumulo.server.test.TestMultiTableIngest'
-        args = '-count %d ' % count
+        args = '--count %d -u root -i %s ' % (count, INSTANCE_NAME)
         return self.runClassOn(host, klass, args.split())
 
     def verify(self, host, count, *args, **kwargs):
         klass = 'org.apache.accumulo.server.test.TestMultiTableIngest'
-        args = '-count %d -readonly ' % count
+        args = '--count %d --readonly -u root -i %s ' % (count, INSTANCE_NAME)
         return self.runClassOn(host, klass, args.split())
 
 

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/split.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/split.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/split.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/split.py Mon Jan 14 22:03:24 2013
@@ -75,8 +75,8 @@ class TabletShouldSplit(SunnyDayTest):
 
         h = self.runOn(self.masterHost(), [self.accumulo_sh(),
                                            'org.apache.accumulo.server.util.CheckForMetadataProblems',
-                                           'root',
-                                           'secret'])
+                                           '-u', 'root',
+                                           '-p', 'secret'])
         out, err = h.communicate()
         self.assert_(h.returncode == 0)
         

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/zoo.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/zoo.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/zoo.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/zoo.py Mon Jan 14 22:03:24 2013
@@ -28,7 +28,7 @@ class SessionExpired(SunnyDayTest):
 
     def signal(self, which):
         for host in self.hosts:
-            self.pkill(host, ' tserver$', which)
+            self.pkill(host, '=tserver', which)
 
     def runTest(self):
         # stop the tservers from talking to zookeeeper

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/simple/zooCacheTest.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/simple/zooCacheTest.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/simple/zooCacheTest.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/simple/zooCacheTest.py Mon Jan 14 22:03:24 2013
@@ -36,7 +36,7 @@ class ZooCacheTest(TestUtilsMixin, unitt
         handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
         handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
         handleW = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
-        self.waitForStop(handleW, 90)
+        self.waitForStop(handleW, 200)
         self.waitForStop(handleR1, 1)
         self.waitForStop(handleR2, 1)
         self.waitForStop(handleR3, 1)

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/stress/batchWrite.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/stress/batchWrite.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/stress/batchWrite.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/stress/batchWrite.py Mon Jan 14 22:03:24 2013
@@ -33,7 +33,7 @@ class WriteLots(unittest.TestCase, TestU
 
     def ingest(self, host, start, count, **kwargs):
         klass = 'org.apache.accumulo.server.test.TestIngest'
-        args = '-tsbw -size 50 -random 56 %d %d 1' % (count, start)
+        args = '--user root --size 50 --random 56 --rows %d --start %d --cols 1' % (count, start)
         return self.runClassOn(host, klass, args.split(), **kwargs)
 
     def setUp(self):
@@ -48,7 +48,7 @@ class WriteLots(unittest.TestCase, TestU
 
     def runTest(self):
         N = 10*len(self.hosts)
-        waitTime = 60 * N * self.options.rows / 200000 + 30
+        waitTime = 60 * N * self.options.rows / 200000 + 90
 
         log.info("Starting %d clients", N)
         handles = []

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/stress/halfDead.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/stress/halfDead.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/stress/halfDead.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/stress/halfDead.py Mon Jan 14 22:03:24 2013
@@ -40,8 +40,7 @@ class TabletServerHangs(SunnyDayTest):
          os.environ['LD_PRELOAD'] = libpath
          os.environ['DYLD_INSERT_LIBRARIES'] = libpath
          os.environ['DYLD_FORCE_FLAT_NAMESPACE'] = 'true'
-         self.stop = self.runOn(self.masterHost(),
-                                [self.accumulo_sh(), 'tserver'])
+         self.stop = self.runOn(self.masterHost(), [self.accumulo_sh(), 'tserver'])
          del os.environ['LD_PRELOAD']
          del os.environ['DYLD_FORCE_FLAT_NAMESPACE']
          del os.environ['DYLD_INSERT_LIBRARIES']
@@ -60,8 +59,10 @@ class TabletServerHangs(SunnyDayTest):
                                      MANY_ROWS,
                                      size=self.options.size)
          # wait for the ingester to get going
-         self.ingester.stdout.readline()
-         self.ingester.stdout.readline()
+         for i in range(100):
+	     line = self.ingester.stdout.readline()
+	     if line == '' or line.find(' sent ') > 0:
+                break
 
          log.info("Starting faking disk failure for tserver")
          fp = open(self.flagFile, "w+")

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/stress/restart.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/stress/restart.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/stress/restart.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/stress/restart.py Mon Jan 14 22:03:24 2013
@@ -78,11 +78,11 @@ class KilledTabletServerTest(RestartTest
         self.waitForStop(handle, timeout)
 
     def readRows(self):
-        self.stopRead(self.startRead(), 300)
+        self.stopRead(self.startRead(), 400)
 
     def runTest(self):
 
-        self.waitForStop(self.ingester, 60)
+        self.waitForStop(self.ingester, 120)
         log.info("Ingester stopped")
         log.info("starting scan")
         self.readRows()
@@ -138,7 +138,7 @@ class KilledTabletDuringScan(KilledTable
 
     def runTest(self):
 
-        self.waitForStop(self.ingester, 30)
+        self.waitForStop(self.ingester, 90)
         log.info("Ingester stopped")
         handle = self.startRead()
 
@@ -148,14 +148,14 @@ class KilledTabletDuringScan(KilledTable
             self.start_tserver(host)
             log.info("Tablet server on %s started", host)
             log.info("starting scan")
-            self.stopRead(handle, 400)
+            self.stopRead(handle, 500)
             if host != self.hosts[-1]:
                 handle = self.startRead()
 
 class KilledTabletDuringShutdown(KilledTabletServerTest):
 
     def runTest(self):
-        self.waitForStop(self.ingester, 30)
+        self.waitForStop(self.ingester, 90)
         log.info("Ingester stopped")
         self.stop_tserver(self.hosts[0], signal.SIGKILL)
         log.info("This can take a couple minutes")

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/README
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/README?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/README (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/README Mon Jan 14 22:03:24 2013
@@ -8,8 +8,8 @@ Syntax for running run.py:
 Specifying a specific benchmark or set of benchmarks runs only those, while 
 not specifying any runs all benchmarks.
 -l Lists the benchmarks that will be run
--v <run_speed> can either be slow, medium or fast
--s <log_level> is a number representing the verbosity of the debugging output: 10 is debug, 20 is info, 30 is warning, etc.
+-s <run_speed> can either be slow, medium or fast
+-v <log_level> is a number representing the verbosity of the debugging output: 10 is debug, 20 is info, 30 is warning, etc.
 -u <user> user to use when connecting with accumulo.  If not set you will be prompted to input it.
 -p <password> password to use when connecting with accumulo.  If not set you will be prompted to input it.
 -i <instance> instance to use when connecting with accumulo.  If not set you will be prompted to input it.
@@ -38,5 +38,6 @@ The 4th Benchmark is Terasort.  Run the 
 
 4. Misc
 
-These benchmarks create tables in accumulo named 'test_ingest' and 'CloudIngestTest'.  These tables are *NOT* deleted
-at the end of the benchmarks.
+These benchmarks create tables in accumulo named 'test_ingest' and 'CloudIngestTest'.  These tables are deleted
+at the end of the benchmarks. The benchmarks will also alter user auths while it runs. It is recommended that
+a benchmark user is created.

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/cloudstone1/cloudstone1.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/cloudstone1/cloudstone1.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/cloudstone1/cloudstone1.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/cloudstone1/cloudstone1.py Mon Jan 14 22:03:24 2013
@@ -30,6 +30,7 @@ class CloudStone1(Benchmark):
 
     def runTest(self):
         code, out, err = cloudshell.run(self.username, self.password, 'table !METADATA\nscan\n')
+        self.assertEqual(code, 0, "Could not scan the !METADATA table. %s %s" % (out, err))
         results = runAll('echo help | %s shell' %
                          accumulo('bin', 'accumulo'))
                          

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/Benchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/Benchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/Benchmark.py Mon Jan 14 22:03:24 2013
@@ -91,10 +91,7 @@ class Benchmark(unittest.TestCase):
         return 0
     
     def findjar(self, path):
-        globjar = glob.glob(path)
-        for j in globjar:
-            if j.find('javadoc') >= 0 or j.find('sources') >= 0:
-                globjar.remove(j)
+        globjar = [ j for j in glob.glob(path) if j.find('javadoc') == -1 and j.find('sources') == -1 ]
         return globjar[0]
         
     # Returns the location of the local examples jar
@@ -105,9 +102,12 @@ class Benchmark(unittest.TestCase):
     def getjars(self, delim=','):
         accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core*.jar'))
         accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start*.jar'))
+        accumulo_fate_jar = self.findjar(accumulo('lib', 'accumulo-fate*.jar'))
+        cloudtrace_jar = self.findjar(accumulo('lib', 'cloudtrace*.jar'))
         accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift*.jar'))
         accumulo_zookeeper_jar = self.findjar(os.path.join(os.getenv('ZOOKEEPER_HOME'), 'zookeeper*.jar'))
-        return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar, accumulo_start_jar])
+        return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar, accumulo_start_jar,
+            accumulo_fate_jar, cloudtrace_jar])
        
     # Builds the running command for the map/reduce class specified sans the arguments
     def buildcommand(self, classname, *args):

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/CreateTablesBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/CreateTablesBenchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/CreateTablesBenchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/CreateTablesBenchmark.py Mon Jan 14 22:03:24 2013
@@ -30,20 +30,31 @@ class CreateTablesBenchmark(Benchmark):
     tables = 1000
 
     def setUp(self): 
+        for x in range(1, self.tables):
+            currentTable = 'test_ingest%d' % (x)      
+            log.debug("Checking for table existence: %s" % currentTable)
+            code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % currentTable)
+            if out.find('does not exist') == -1:
+                command = 'deletetable -f %s\n' % (currentTable)
+                log.debug("Running Command %r", command)
+                code, out, err = cloudshell.run(self.username, self.password, command)
+                self.assertEqual(code, 0, 'Did not successfully delete table: %s' % currentTable)
         Benchmark.setUp(self)  
-        
+
     def runTest(self):
         for x in range(1, self.tables):
             currentTable = 'test_ingest%d' % (x)      
             command = 'createtable %s\n' % (currentTable)
             log.debug("Running Command %r", command)
             code, out, err = cloudshell.run(self.username, self.password, command)
+            self.assertEqual(code, 0, 'Did not successfully create table: %s' % currentTable)
             # print err
         for x in range(1, self.tables):
             currentTable = 'test_ingest%d' % (x)      
-            command = 'deletetable %s\n' % (currentTable)
+            command = 'deletetable -f %s\n' % (currentTable)
             log.debug("Running Command %r", command)
             code, out, err = cloudshell.run(self.username, self.password, command)
+            self.assertEqual(code, 0, 'Did not successfully delete table: %s' % currentTable)
             # print err
         log.debug("Process finished")
         return code, out, err

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/IngestBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/IngestBenchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/IngestBenchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/IngestBenchmark.py Mon Jan 14 22:03:24 2013
@@ -30,14 +30,21 @@ class IngestBenchmark(Benchmark):
 
     def setUp(self):
         code, out, err = cloudshell.run(self.username, self.password, 'table test_ingest\n')
-        if out.find('no such table') >= 0:
+        if out.find('does not exist') == -1:
             log.debug("Deleting table test_ingest")
-            code, out, err = cloudshell.run(self.username, self.password, 'deletetable test_ingest\n')
-            self.sleep(10)
+            code, out, err = cloudshell.run(self.username, self.password, 'deletetable test_ingest -f\n')
+            self.assertEquals(code, 0, "Could not delete the table 'test_ingest'")
         code, out, err = cloudshell.run(self.username, self.password, 'createtable test_ingest\n')
-        self.assertEqual(code, 0)
+        self.assertEqual(code, 0, "Could not create the table 'test_ingest'")
         Benchmark.setUp(self)
 
+    def tearDown(self):
+        command = 'deletetable test_ingest -f\n'
+        log.debug("Running Command %r", command)
+        code, out, err = cloudshell.run(self.username, self.password, command)
+        self.assertEqual(code, 0, "Could not delete the table 'test_ingest'")
+        Benchmark.tearDown(self)
+
     def size(self):
         return 50
 
@@ -50,7 +57,7 @@ class IngestBenchmark(Benchmark):
     def runTest(self):
         commands = {}
         for i, s in enumerate(slaveNames()):
-            commands[s] = '%s %s -username %s -password %s -size %d -random %d %d %d %d' % (
+            commands[s] = '%s %s -u %s -p %s --size %d --random %d --rows %d --start %d --cols %d' % (
                 accumulo('bin', 'accumulo'),
                 'org.apache.accumulo.server.test.TestIngest',
                 self.username, self.password,
@@ -67,10 +74,6 @@ class IngestBenchmark(Benchmark):
         for code, slaves in codes.items():
             if code != 0:
                 self.assertEqual(code, 0, "Bad exit code (%d) from slaves %r" % (code, slaves))
-        command = 'deletetable test_ingest\n'
-        log.debug("Running Command %r", command)
-        code, out, err = cloudshell.run(self.username, self.password, command)
-        # print err
 
     def score(self):
         if self.finished:

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/RowHashBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/RowHashBenchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/RowHashBenchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/RowHashBenchmark.py Mon Jan 14 22:03:24 2013
@@ -42,41 +42,50 @@ class RowHashBenchmark(Benchmark):
     output_table = 'RowHashTestOutput'
 
     def setUp(self): 
-        random.jumpahead(int(time.time()))
-        num = random.randint(1, 100000)
-        self.input_table = self.input_table + "_" + str(num) 
-        self.output_table = self.output_table + "_" + str(num)    
-        #if (not os.getenv("HADOOP_CLASSPATH")):
-        #    os.putenv("HADOOP_CLASSPATH", self.getjars(":"))
         dir = os.path.dirname(os.path.realpath(__file__))
         file = os.path.join( dir, 'splits' )  
-        # code, out, err = cloudshell.run(self.username, self.password, 'table RowHashTestInput\n') 
-        # if out.find('no such table') == -1:
-        #    code, out, err = cloudshell.run(self.username, self.password, 'deletetable RowHashTestInput\n') 
-        #    self.sleep(15)
+        code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.input_table) 
+        if out.find('does not exist') == -1:
+           code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % self.input_table) 
+           self.sleep(15)
         code, out, err = cloudshell.run(self.username, self.password, "createtable %s -sf %s\n" % (self.input_table, file))
-        #code, out, err = cloudshell.run('table RowHashTest\n') 
-        #if out.find('no such table') == -1:
-        #    code, out, err = cloudshell.run('user root\nsecret\ndeletetable RowHashTest\n') 
-        #    self.sleep(15)
+        code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.output_table) 
+        if out.find('does not exist') == -1:
+            code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' %
+                    self.output_table) 
+            self.sleep(15)
         code, out, err = cloudshell.run(self.username, self.password, "createtable %s -sf %s\n" % (self.output_table, file))
         command = self.buildcommand('org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest',
-                                    self.numrows(),
-                                    self.keysizemin(),
-                                    self.keysizemax(),
-                                    self.minvaluesize(),
-                                    self.maxvaluesize(),
-                                    self.input_table, 
-                                    self.getInstance(),
-                                    self.getZookeepers(),
-                                    self.getUsername(),
-                                    self.getPassword(),
-                                    self.maxmaps)
+                                    '--count', self.numrows(),
+                                    '-nk', self.keysizemin(),
+                                    '-xk', self.keysizemax(),
+                                    '-nv', self.minvaluesize(),
+                                    '-xv', self.maxvaluesize(),
+                                    '--table', self.input_table, 
+                                    '-i', self.getInstance(),
+                                    '-z', self.getZookeepers(),
+                                    '-u', self.getUsername(),
+                                    '-p', self.getPassword(),
+                                    '--splits', self.maxmaps)
         handle = runner.start(command, stdin=subprocess.PIPE)
         log.debug("Running: %r", command)
         out, err = handle.communicate("")  
         Benchmark.setUp(self)
 
+    def tearDown(self):
+        code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.input_table)
+        self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.input_table, out))
+        code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.output_table)
+        self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.output_table, out))
+        Benchmark.tearDown(self)
+
+    def tearDown(self):
+        code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.input_table)
+        self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.input_table, out))
+        code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.output_table)
+        self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.output_table, out))
+        Benchmark.tearDown(self)
+
     def keysizemin(self):
         return self.keymin
 
@@ -109,7 +118,7 @@ class RowHashBenchmark(Benchmark):
         return handle.returncode, out, err
     
     def shortDescription(self):
-        return 'Hashes %d rows from one tableand outputs them into another Table. '\
+        return 'Hashes %d rows from one table and outputs them into another table. '\
                'Lower score is better.' % (self.numrows())
                
     def setSpeed(self, speed):

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/TableSplitsBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/TableSplitsBenchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/TableSplitsBenchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/TableSplitsBenchmark.py Mon Jan 14 22:03:24 2013
@@ -35,35 +35,31 @@ class TableSplitsBenchmark(Benchmark):
     tablename = 'test_splits'
 
     def setUp(self): 
-        random.jumpahead(int(time.time()))
-        num = random.randint(1, 100000)
-        self.tablename = self.tablename + "_" + str(num)     
         # Need to generate a splits file for each speed
-        #code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename)
-        #if out.find('no such table') == -1:
-        #    log.debug('Deleting table %s' % self.tablename)
-        #    code, out, err = cloudshell.run('user %s\n%s\ndeletetable %s\n' % (self.user, 
-        #                                                                          self.password, 
-        #                                                                          self.tablename))
-        #    self.sleep(5)
+        code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename)
+        if out.find('does not exist') == -1:
+            log.debug('Deleting table %s' % self.tablename)
+            code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s -f\n' % self.tablename)
+            self.assertEqual(code, 0, "Could not delete table")
         Benchmark.setUp(self)
 
     def runTest(self):             
         command = 'createtable %s -sf %s\n' % (self.tablename, self.splitsfile)
         log.debug("Running Command %r", command)
         code, out, err = cloudshell.run(self.username, self.password, command)
+        self.assertEqual(code, 0, 'Could not create table: %s' % out)
         return code, out, err
 
     def shortDescription(self):
         return 'Creates a table with splits. Lower score is better.'
         
     def tearDown(self):
+        command = 'deletetable %s -f\n' % self.tablename
+        log.debug("Running Command %r", command)
+        code, out, err = cloudshell.run(self.username, self.password, command)
+        self.assertEqual(code, 0, "Could not delete table")
+        log.debug("Process finished")        
         Benchmark.tearDown(self)
-        # self.sleep(5)
-        # command = 'deletetable test_splits\n'
-        # log.debug("Running Command %r", command)
-        # code, out, err = cloudshell.run(self.username, self.password, command)
-        # log.debug("Process finished")        
 
     def setSpeed(self, speed):
         dir = os.path.dirname(os.path.realpath(__file__))

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/TeraSortBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/TeraSortBenchmark.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/TeraSortBenchmark.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/TeraSortBenchmark.py Mon Jan 14 22:03:24 2013
@@ -42,16 +42,16 @@ class TeraSortBenchmark(Benchmark):
 
 
     def setUp(self): 
-        random.jumpahead(int(time.time()))
-        num = random.randint(1, 100000)   
-        #self.tablename = self.tablename + "-" + str(num)  
-        # Find which hadoop version
-        # code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename)
-        #if out.find('no such table') == -1:
-        #    log.debug('Deleting table %s' % self.tablename)
-        #    code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.tablename)
-        #    self.sleep(10)
+        code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename)
+        if out.find('does not exist') == -1:
+            log.debug('Deleting table %s' % self.tablename)
+            code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % self.tablename)
         Benchmark.setUp(self)
+
+    def tearDown(self):
+        code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.tablename)
+        self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.tablename, out))
+        Benchmark.tearDown(self)
         
     def keysizemin(self):
         return self.keymin
@@ -88,6 +88,7 @@ class TeraSortBenchmark(Benchmark):
         log.debug("Running: %r", command)
         out, err = handle.communicate("")
         log.debug("Process finished: %d (%s)", handle.returncode, ' '.join(handle.command))
+        self.assertEqual(handle.returncode, 0, "Job did not complete successfully")
         return handle.returncode, out, err
         
     def needsAuthentication(self):

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/cloudshell.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/cloudshell.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/cloudshell.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/cloudshell.py Mon Jan 14 22:03:24 2013
@@ -23,7 +23,7 @@ from lib.options import log
     
 def run(username, password, input):
     "Run a command in accumulo"
-    handle = runner.start([path.accumulo('bin', 'accumulo'), 'shell -u %s -p %s' % (username, password) ],
+    handle = runner.start([path.accumulo('bin', 'accumulo'), 'shell', '-u', username, '-p', password],
                           stdin=subprocess.PIPE)
     log.debug("Running: %r", input)
     out, err = handle.communicate(input)

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/lib/path.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/lib/path.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/lib/path.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/lib/path.py Mon Jan 14 22:03:24 2013
@@ -17,9 +17,7 @@
 import os
 
 HERE = os.path.dirname(__file__)
-ACCUMULO_HOME = os.path.normpath(
-    os.path.join(HERE, *(os.pardir,)*4)
-    )
+ACCUMULO_HOME = os.getenv('ACCUMULO_HOME')
 
 def accumulo(*args):
     return os.path.join(ACCUMULO_HOME, *args)

Modified: accumulo/branches/ACCUMULO-259/test/system/bench/run.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/bench/run.py?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/bench/run.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/bench/run.py Mon Jan 14 22:03:24 2013
@@ -55,6 +55,9 @@ def main():
     if not os.getenv('ZOOKEEPER_HOME'):
         print 'Please set the environment variable \'ZOOKEEPER_HOME\' before running the benchmarks'
         sys.exit(0)
+    if not os.getenv('ACCUMULO_HOME'):
+        print 'Please set the environment variable \'ACCUMULO_HOME\' before running the benchmarks'
+        sys.exit(0)
     import textwrap
     benchmarks = getBenchmarks()
     benchmarks.sort(benchComparator)

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/report.pl
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/report.pl?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/report.pl (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/report.pl Mon Jan 14 22:03:24 2013
@@ -88,7 +88,7 @@ sub plot {
 	my $output = shift(@_);
 	my $title = shift(@_);
 
-	system("$cmd | $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.TimeBinner $period $time_col $data_col $op MM/dd/yy-HH:mm:ss > $REPORT_DIR/$output.dat");
+	system("$cmd | $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.TimeBinner --period $period --timeColumn $time_col --dataColumn $data_col --operation $op --dateFormat MM/dd/yy-HH:mm:ss > $REPORT_DIR/$output.dat");
 	gnuplot("$REPORT_DIR/$output.dat", "$REPORT_DIR/$output.png", $op eq "AMM" || $op eq "AMM_HACK1");
 
 	print HTML "<P><h2>$title</h2><img src='$output.png'>\n";

Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/run-moru.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/run-moru.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/run-moru.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/run-moru.sh Mon Jan 14 22:03:24 2013
@@ -18,5 +18,5 @@
 
 . mapred-setup.sh
 
-$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" org.apache.accumulo.server.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $MAX_CF $MAX_CQ $MAX_MEM $MAX_LATENCY $NUM_THREADS $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/branches/ACCUMULO-259/test/system/continuous/run-verify.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/run-verify.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/run-verify.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/run-verify.sh Mon Jan 14 22:03:24 2013
@@ -23,6 +23,9 @@ AUTH_OPT="";
 if [ -n "$VERIFY_AUTHS" ] ; then
 	AUTH_OPT="--auths $VERIFY_AUTHS";
 fi
+SCAN_OPT=--offline
+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 $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $VERFIY_OUT $VERIFY_MAX_MAPS $VERIFY_REDUCERS $SCAN_OFFLINE
-
+$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/branches/ACCUMULO-259/test/system/continuous/start-agitator.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-agitator.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-agitator.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-agitator.sh Mon Jan 14 22:03:24 2013
@@ -18,6 +18,8 @@
 
 . continuous-env.sh
 
+mkdir -p $CONTINUOUS_LOG_DIR
+
 nohup ./agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $MIN_KILL $MAX_KILL >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_agitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_agitator.err &
 
 nohup ./magitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.err &

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=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-batchwalkers.sh Mon Jan 14 22:03:24 2013
@@ -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 $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 $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 --scanThreads $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=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-ingest.sh Mon Jan 14 22:03:24 2013
@@ -28,6 +28,10 @@ fi
 if [ -n "$VISIBILITIES" ] ; then
 	VIS_OPT="--visibilities \"$VISIBILITIES\"";
 fi
+CHECKSUM_OPT=--addCheckSum
+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 $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
+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/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=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-scanners.sh Mon Jan 14 22:03:24 2013
@@ -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 $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_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/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=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh (original)
+++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-stats.sh Mon Jan 14 22:03:24 2013
@@ -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 $TABLE $INSTANCE_NAME $ZOO_KEEPERS $USER $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 &
 



Mime
View raw message