public
/
ottertune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raise exception if oltpbench fails

This commit is contained in:
bohanjason 2020-05-23 18:29:02 -04:00 committed by Bohan Zhang
parent 131645f059
commit e6ee50eaa9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/driver/fabfile.py vendored
View File

@ -621,8 +621,13 @@ def _ready_to_shut_down_controller():
if os.path.exists(pidfile) and os.path.exists(dconf.OLTPBENCH_LOG): if os.path.exists(pidfile) and os.path.exists(dconf.OLTPBENCH_LOG):
with open(dconf.OLTPBENCH_LOG, 'r') as f: with open(dconf.OLTPBENCH_LOG, 'r') as f:
content = f.read() content = f.read()
if 'Failed' in content:
m = re.search('\n.*Failed.*\n', content)
error_msg = m.group(0)
LOG.info('OLTPBench Failed!')
return True, error_msg
ready = 'Output throughput samples into file' in content ready = 'Output throughput samples into file' in content
return ready return ready, None
def clean_logs(): def clean_logs():
@ -742,14 +747,18 @@ def loop(i):
LOG.info('Start the first collection') LOG.info('Start the first collection')
# stop the experiment # stop the experiment
while not _ready_to_shut_down_controller(): ready_to_shut_down = False
error_msg = None
while not ready_to_shut_down:
ready_to_shut_down, error_msg = _ready_to_shut_down_controller()
time.sleep(1) time.sleep(1)
signal_controller() signal_controller()
LOG.info('Start the second collection, shut down the controller') LOG.info('Start the second collection, shut down the controller')
p.join() p.join()
if error_msg:
raise Exception('OLTPBench Failed: ' + error_msg)
# add user defined metrics # add user defined metrics
if dconf.ENABLE_UDM is True: if dconf.ENABLE_UDM is True:
add_udm() add_udm()
@ -770,7 +779,6 @@ def loop(i):
# change config # change config
change_conf(response['recommendation']) change_conf(response['recommendation'])
@task @task
def run_loops(max_iter=10): def run_loops(max_iter=10):
# dump database if it's not done before. # dump database if it's not done before.