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

move restart location; auto fix knob range

This commit is contained in:
yangdsh 2019-12-04 01:42:52 +00:00 committed by Dana Van Aken
parent c739eb066e
commit 4e5db94697
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
client/driver/fabfile.py vendored
View File

@ -530,22 +530,6 @@ def loop(i):
# remove oltpbench log and controller log # remove oltpbench log and controller log
clean_logs() clean_logs()
# restart database
restart_succeeded = restart_database()
if not restart_succeeded:
files = {'summary': b'{"error": "DB_RESTART_ERROR"}',
'knobs': b'{}',
'metrics_before': b'{}',
'metrics_after': b'{}'}
response = requests.post(dconf.WEBSITE_URL + '/new_result/', files=files,
data={'upload_code': dconf.UPLOAD_CODE})
response = get_result()
result_timestamp = int(time.time())
save_next_config(response, t=result_timestamp)
change_conf(response['recommendation'])
return
time.sleep(dconf.RESTART_SLEEP_SEC)
# check disk usage # check disk usage
if check_disk_usage() > dconf.MAX_DISK_USAGE: if check_disk_usage() > dconf.MAX_DISK_USAGE:
@ -603,14 +587,30 @@ def run_loops(max_iter=1):
dump = dump_database() dump = dump_database()
for i in range(int(max_iter)): for i in range(int(max_iter)):
# restart database
restart_succeeded = restart_database()
if not restart_succeeded:
files = {'summary': b'{"error": "DB_RESTART_ERROR"}',
'knobs': b'{}',
'metrics_before': b'{}',
'metrics_after': b'{}'}
response = requests.post(dconf.WEBSITE_URL + '/new_result/', files=files,
data={'upload_code': dconf.UPLOAD_CODE})
response = get_result()
result_timestamp = int(time.time())
save_next_config(response, t=result_timestamp)
change_conf(response['recommendation'])
continue
# reload database periodically
if dconf.RELOAD_INTERVAL > 0: if dconf.RELOAD_INTERVAL > 0:
if i % dconf.RELOAD_INTERVAL == 0: if i % dconf.RELOAD_INTERVAL == 0:
if i == 0 and dump is False: if i == 0 and dump is False:
restart_database()
restore_database() restore_database()
elif i > 0: elif i > 0:
restore_database() restore_database()
time.sleep(dconf.RESTART_SLEEP_SEC)
LOG.info('The %s-th Loop Starts / Total Loops %s', i + 1, max_iter) LOG.info('The %s-th Loop Starts / Total Loops %s', i + 1, max_iter)
loop(i % dconf.RELOAD_INTERVAL if dconf.RELOAD_INTERVAL > 0 else i) loop(i % dconf.RELOAD_INTERVAL if dconf.RELOAD_INTERVAL > 0 else i)
LOG.info('The %s-th Loop Ends / Total Loops %s', i + 1, max_iter) LOG.info('The %s-th Loop Ends / Total Loops %s', i + 1, max_iter)

12
server/website/website/db/base/parser.py
View File

@ -163,7 +163,17 @@ class BaseParser:
return knob_data return knob_data
def _check_knob_num_in_range(self, value, mdata): def _check_knob_num_in_range(self, value, mdata, fix_knob_range=True):
minval = float(mdata.minval)
maxval = float(mdata.maxval)
if fix_knob_range:
if minval > value:
LOG.debug("Changing knob %s minval from %f to %f", mdata.name, minval, value)
mdata.minval = str(value)
if maxval < value:
LOG.debug("Changing knob %s maxval from %f to %f", mdata.name, maxval, value)
mdata.maxval = str(value)
mdata.save()
return float(mdata.minval) <= value <= float(mdata.maxval) return float(mdata.minval) <= value <= float(mdata.maxval)
def _check_knob_bool_val(self, value): def _check_knob_bool_val(self, value):