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

fix bugs

Browse Source
This commit is contained in:
yangdsh
2019-12-10 02:23:22 +00:00
committed by Dana Van Aken
parent 642d7c3875
commit 7ade03e3e5
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,12 @@ class ConfigurationRecommendation(UpdateTask): # pylint: disable=abstract-metho
result_id = retval['result_id']
result = Result.objects.get(pk=result_id)
# Create next configuration to try
config = db.parser.create_knob_configuration(result.dbms.pk, retval['recommendation'])
retval['recommendation'] = config
result.next_configuration = JSONUtil.dumps(retval)
result.save()
# Replace result with formatted result
formatted_params = db.parser.format_dbms_knobs(result.dbms.pk, retval['recommendation'])
task_meta = TaskMeta.objects.get(task_id=task_id)
@@ -117,12 +123,6 @@ class ConfigurationRecommendation(UpdateTask): # pylint: disable=abstract-metho
task_meta.result = retval
task_meta.save()
# Create next configuration to try
config = db.parser.create_knob_configuration(result.dbms.pk, retval['recommendation'])
retval['recommendation'] = config
result.next_configuration = JSONUtil.dumps(retval)
result.save()
def clean_knob_data(knob_matrix, knob_labels, session):
# Makes sure that all knobs in the dbms are included in the knob_matrix and knob_labels

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

@@ -491,17 +491,7 @@ def handle_result_files(session, files):
for knob in data_knobs.keys():
for tunable_knob in last_conf.keys():
if tunable_knob in knob:
unit = KnobCatalog.objects.get(dbms=session.dbms, name=knob).unit
bytes_system = ConversionUtil.DEFAULT_BYTES_SYSTEM
time_system = ConversionUtil.DEFAULT_TIME_SYSTEM
if unit == 1:
data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob],
bytes_system)
elif unit == 2:
data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob],
time_system)
else:
data_knobs[knob] = last_conf[tunable_knob]
data_knobs[knob] = last_conf[tunable_knob]
knob_data.data = JSONUtil.dumps(data_knobs)
knob_data.name = knob_data.name + '*'