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

fix the bug in generating knob_data for invalid result

This commit is contained in:
yangdsh 2020-02-25 22:15:29 +00:00 committed by Dana Van Aken
parent 9b4bafb86f
commit 60a30c2f85
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/website/website/views.py
View File

@ -506,6 +506,7 @@ def handle_result_files(session, files, execution_times=None):
backup_data = BackupData.objects.filter(result=result).first() backup_data = BackupData.objects.filter(result=result).first()
last_conf = JSONUtil.loads(result.next_configuration) last_conf = JSONUtil.loads(result.next_configuration)
last_conf = last_conf["recommendation"] last_conf = last_conf["recommendation"]
last_conf = parser.convert_dbms_knobs(result.dbms.pk, last_conf)
# Copy latest data and modify # Copy latest data and modify
knob_data = result.knob_data knob_data = result.knob_data
@ -518,7 +519,6 @@ def handle_result_files(session, files, execution_times=None):
knob_data.knobs = JSONUtil.dumps(all_knobs) knob_data.knobs = JSONUtil.dumps(all_knobs)
data_knobs = JSONUtil.loads(knob_data.data) data_knobs = JSONUtil.loads(knob_data.data)
last_conf = parser.convert_dbms_knobs(result.dbms.pk, last_conf)
for knob in data_knobs.keys(): for knob in data_knobs.keys():
for tunable_knob in last_conf.keys(): for tunable_knob in last_conf.keys():
if tunable_knob in knob: if tunable_knob in knob:
@ -532,11 +532,11 @@ def handle_result_files(session, files, execution_times=None):
metric_data = result.metric_data metric_data = result.metric_data
metric_cpy = JSONUtil.loads(metric_data.data) metric_cpy = JSONUtil.loads(metric_data.data)
panelty_factor = JSONUtil.loads(session.hyperparameters).get('PENALTY_FACTOR', 2) penalty_factor = JSONUtil.loads(session.hyperparameters).get('PENALTY_FACTOR', 2)
if metric_meta.improvement == target_objectives.MORE_IS_BETTER: if metric_meta.improvement == target_objectives.MORE_IS_BETTER:
metric_cpy[session.target_objective] = worst_target_value / panelty_factor metric_cpy[session.target_objective] = worst_target_value / penalty_factor
else: else:
metric_cpy[session.target_objective] = worst_target_value * panelty_factor metric_cpy[session.target_objective] = worst_target_value * penalty_factor
metric_cpy = JSONUtil.dumps(metric_cpy) metric_cpy = JSONUtil.dumps(metric_cpy)
metric_data.pk = None metric_data.pk = None
metric_data.name = metric_data.name + '*' metric_data.name = metric_data.name + '*'