You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2013/07/07 17:37:10 UTC
svn commit: r1500455 - in /accumulo/branches/1.4/test/system/bench/lib:
CreateTablesBenchmark.py IngestBenchmark.py RowHashBenchmark.py
TableSplitsBenchmark.py TeraSortBenchmark.py
Author: mdrob
Date: Sun Jul 7 15:37:10 2013
New Revision: 1500455
URL: http://svn.apache.org/r1500455
Log:
ACCUMULO-1519 removing force flag from deletetable commands in cloudstone tests
Modified:
accumulo/branches/1.4/test/system/bench/lib/CreateTablesBenchmark.py
accumulo/branches/1.4/test/system/bench/lib/IngestBenchmark.py
accumulo/branches/1.4/test/system/bench/lib/RowHashBenchmark.py
accumulo/branches/1.4/test/system/bench/lib/TableSplitsBenchmark.py
accumulo/branches/1.4/test/system/bench/lib/TeraSortBenchmark.py
Modified: accumulo/branches/1.4/test/system/bench/lib/CreateTablesBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/bench/lib/CreateTablesBenchmark.py?rev=1500455&r1=1500454&r2=1500455&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/bench/lib/CreateTablesBenchmark.py (original)
+++ accumulo/branches/1.4/test/system/bench/lib/CreateTablesBenchmark.py Sun Jul 7 15:37:10 2013
@@ -35,7 +35,7 @@ class CreateTablesBenchmark(Benchmark):
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)
+ command = 'deletetable %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)
@@ -51,7 +51,7 @@ class CreateTablesBenchmark(Benchmark):
# print err
for x in range(1, self.tables):
currentTable = 'test_ingest%d' % (x)
- command = 'deletetable -f %s\n' % (currentTable)
+ command = 'deletetable %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)
Modified: accumulo/branches/1.4/test/system/bench/lib/IngestBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/bench/lib/IngestBenchmark.py?rev=1500455&r1=1500454&r2=1500455&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/bench/lib/IngestBenchmark.py (original)
+++ accumulo/branches/1.4/test/system/bench/lib/IngestBenchmark.py Sun Jul 7 15:37:10 2013
@@ -32,14 +32,14 @@ class IngestBenchmark(Benchmark):
code, out, err = cloudshell.run(self.username, self.password, 'table test_ingest\n')
if out.find('does not exist') == -1:
log.debug("Deleting table test_ingest")
- code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f test_ingest\n')
+ code, out, err = cloudshell.run(self.username, self.password, 'deletetable test_ingest\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, "Could not create the table 'test_ingest'")
Benchmark.setUp(self)
def tearDown(self):
- command = 'deletetable -f test_ingest\n'
+ command = 'deletetable test_ingest\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'")
Modified: accumulo/branches/1.4/test/system/bench/lib/RowHashBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/bench/lib/RowHashBenchmark.py?rev=1500455&r1=1500454&r2=1500455&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/bench/lib/RowHashBenchmark.py (original)
+++ accumulo/branches/1.4/test/system/bench/lib/RowHashBenchmark.py Sun Jul 7 15:37:10 2013
@@ -46,12 +46,12 @@ class RowHashBenchmark(Benchmark):
file = os.path.join( dir, 'splits' )
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)
+ code, out, err = cloudshell.run(self.username, self.password, 'deletetable %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(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' %
+ code, out, err = cloudshell.run(self.username, self.password, 'deletetable %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))
@@ -73,9 +73,9 @@ class RowHashBenchmark(Benchmark):
Benchmark.setUp(self)
def tearDown(self):
- code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.input_table)
+ 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 -f %s\n" % self.output_table)
+ 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)
Modified: accumulo/branches/1.4/test/system/bench/lib/TableSplitsBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/bench/lib/TableSplitsBenchmark.py?rev=1500455&r1=1500454&r2=1500455&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/bench/lib/TableSplitsBenchmark.py (original)
+++ accumulo/branches/1.4/test/system/bench/lib/TableSplitsBenchmark.py Sun Jul 7 15:37:10 2013
@@ -39,7 +39,7 @@ class TableSplitsBenchmark(Benchmark):
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)
+ code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.tablename)
self.assertEqual(code, 0, "Could not delete table")
Benchmark.setUp(self)
@@ -54,7 +54,7 @@ class TableSplitsBenchmark(Benchmark):
return 'Creates a table with splits. Lower score is better.'
def tearDown(self):
- command = 'deletetable -f %s\n' % self.tablename
+ command = 'deletetable %s\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")
Modified: accumulo/branches/1.4/test/system/bench/lib/TeraSortBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/bench/lib/TeraSortBenchmark.py?rev=1500455&r1=1500454&r2=1500455&view=diff
==============================================================================
--- accumulo/branches/1.4/test/system/bench/lib/TeraSortBenchmark.py (original)
+++ accumulo/branches/1.4/test/system/bench/lib/TeraSortBenchmark.py Sun Jul 7 15:37:10 2013
@@ -45,11 +45,11 @@ class TeraSortBenchmark(Benchmark):
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)
+ code, out, err = cloudshell.run(self.username, self.password, 'deletetable %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)
+ code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.tablename)
self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.tablename, out))
Benchmark.tearDown(self)