Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ACCUMULO-897 get the benchmarks to run again

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1424615 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit a7fc4170fb4ff81721f370c80d17aa86ae3d6c75 1 parent a91c8a2
Eric C. Newton authored
View
5 test/system/bench/README
@@ -38,5 +38,6 @@ The 4th Benchmark is Terasort. Run the benchmarks with speed 'slow' to do a ful
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.
View
14 test/system/bench/lib/IngestBenchmark.py
@@ -57,15 +57,15 @@ def count(self):
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',
- '-u', self.username, '-p', self.password,
- '--size', self.size(),
- '--random', self.random(),
- '--rows', self.count(),
- '--start', i*self.count(),
- '--cols', 1)
+ self.username, self.password,
+ self.size(),
+ self.random(),
+ self.count(),
+ i*self.count(),
+ 1)
results = runEach(commands)
codes = {}
for slave, (code, out, err) in results.items():
View
13 test/system/bench/lib/RowHashBenchmark.py
@@ -42,8 +42,6 @@ class RowHashBenchmark(Benchmark):
output_table = 'RowHashTestOutput'
def setUp(self):
- #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 %s\n' % self.input_table)
@@ -63,12 +61,12 @@ def setUp(self):
'-xk', self.keysizemax(),
'-nv', self.minvaluesize(),
'-xv', self.maxvaluesize(),
- '-t', self.input_table,
+ '--table', self.input_table,
'-i', self.getInstance(),
'-z', self.getZookeepers(),
'-u', self.getUsername(),
'-p', self.getPassword(),
- --splits', self.maxmaps)
+ '--splits', self.maxmaps)
handle = runner.start(command, stdin=subprocess.PIPE)
log.debug("Running: %r", command)
out, err = handle.communicate("")
@@ -81,6 +79,13 @@ def tearDown(self):
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
View
4 test/system/bench/lib/path.py
@@ -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)
View
3  test/system/bench/run.py
@@ -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)
Please sign in to comment.
Something went wrong with that request. Please try again.