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

give more penalty to invalid configs

This commit is contained in:
yangdsh 2020-02-25 21:30:20 +00:00 committed by Dana Van Aken
parent 27a275e21e
commit 9b4bafb86f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/website/website/tasks/async_tasks.py
View File

@ -684,9 +684,13 @@ def configuration_recommendation(recommendation_input):
params = JSONUtil.loads(session.hyperparameters) params = JSONUtil.loads(session.hyperparameters)
if target_data['bad'] is True: if target_data['bad'] is True:
if session.tuning_session == 'randomly_generate':
info = 'Randomly generated'
else:
info = 'WARNING: no training data, the config is generated by LHS'
target_data_res = create_and_save_recommendation( target_data_res = create_and_save_recommendation(
recommended_knobs=target_data['config_recommend'], result=newest_result, recommended_knobs=target_data['config_recommend'], result=newest_result,
status='bad', info='WARNING: no training data, the config is generated by LHS', status='bad', info=info,
pipeline_run=target_data['pipeline_run']) pipeline_run=target_data['pipeline_run'])
LOG.debug('%s: Skipping configuration recommendation.\nData:\n%s\n\n', LOG.debug('%s: Skipping configuration recommendation.\nData:\n%s\n\n',
AlgorithmType.name(algorithm), target_data) AlgorithmType.name(algorithm), target_data)

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

@ -488,11 +488,12 @@ def handle_result_files(session, files, execution_times=None):
LOG.debug("Error in restarting database") LOG.debug("Error in restarting database")
# Find worst throughput # Find worst throughput
past_metrics = MetricData.objects.filter(session=session) past_metrics = MetricData.objects.filter(session=session)
metric_meta = target_objectives.get_instance(session.dbms.pk, session.target_objective)
worst_target_value = None worst_target_value = None
for past_metric in past_metrics: for past_metric in past_metrics:
if '*' in past_metric.name:
continue
target_value = JSONUtil.loads(past_metric.data)[session.target_objective] target_value = JSONUtil.loads(past_metric.data)[session.target_objective]
metric_meta = target_objectives.get_instance(
session.dbms.pk, session.target_objective)
if metric_meta.improvement == target_objectives.MORE_IS_BETTER: if metric_meta.improvement == target_objectives.MORE_IS_BETTER:
if worst_target_value is None or target_value < worst_target_value: if worst_target_value is None or target_value < worst_target_value:
worst_target_value = target_value worst_target_value = target_value
@ -531,7 +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)
metric_cpy[session.target_objective] = worst_target_value panelty_factor = JSONUtil.loads(session.hyperparameters).get('PENALTY_FACTOR', 2)
if metric_meta.improvement == target_objectives.MORE_IS_BETTER:
metric_cpy[session.target_objective] = worst_target_value / panelty_factor
else:
metric_cpy[session.target_objective] = worst_target_value * panelty_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 + '*'