Commit e19f35e8 authored by Julien Muchembled's avatar Julien Muchembled

tools/matrix: bugfixes

parent f4220e19
......@@ -93,15 +93,14 @@ class MatrixImportBenchmark(BenchmarkRunner):
replicas=replicas,
verbose=self._config.verbose,
)
neo.start()
neo_storage = neo.getZODBStorage()
if not self._config.threaded:
assert len(neo.getStorageList()) == storages
neo.expectOudatedCells(number=0)
# import
start = time()
try:
neo.start()
try:
neo_storage = neo.getZODBStorage()
if not self._config.threaded:
assert len(neo.getStorageList()) == storages
neo.expectOudatedCells(number=0)
start = time()
neo_storage.copyTransactionsFrom(dfs_storage)
end = time()
size = dfs_storage.getSize()
......@@ -110,14 +109,13 @@ class MatrixImportBenchmark(BenchmarkRunner):
else:
assert self._size == size
return end - start
except:
traceback.print_exc()
self.error_log += "Import with m=%s, s=%s, r=%s, p=%s:" % (
masters, storages, replicas, partitions)
self.error_log += "\n%s\n" % ''.join(traceback.format_exc())
return None
finally:
neo.stop()
finally:
neo.stop()
except:
traceback.print_exc()
self.error_log += "Import with m=%s, s=%s, r=%s, p=%s:" % (
masters, storages, replicas, partitions)
self.error_log += "\n%s\n" % ''.join(traceback.format_exc())
def buildReport(self, storages, replicas, results):
# draw an array with results
......@@ -127,7 +125,7 @@ class MatrixImportBenchmark(BenchmarkRunner):
fmt = '|' + '|'.join([' %8s '] * (len(replicas) + 1)) + '|\n'
sep = '+' + '+'.join(['-' * 12] * (len(replicas) + 1)) + '+\n'
report = sep
report += fmt % tuple(['S\R'] + range(0, len(replicas)))
report += fmt % tuple(['S\R'] + replicas)
report += sep
failures = 0
speedlist = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment