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

Fixed Formatting

This commit is contained in:
arifiorino 2019-12-03 22:01:59 +00:00 committed by Dana Van Aken
parent df2dbb6683
commit cd36ff9803
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/driver/fabfile.py vendored
View File

@ -538,7 +538,7 @@ def loop(i):
'metrics_before': b'{}', 'metrics_before': b'{}',
'metrics_after': b'{}'} 'metrics_after': b'{}'}
response = requests.post(dconf.WEBSITE_URL + '/new_result/', files=files, response = requests.post(dconf.WEBSITE_URL + '/new_result/', files=files,
data={'upload_code': dconf.UPLOAD_CODE}) data={'upload_code': dconf.UPLOAD_CODE})
response = get_result() response = get_result()
result_timestamp = int(time.time()) result_timestamp = int(time.time())
save_next_config(response, t=result_timestamp) save_next_config(response, t=result_timestamp)

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

@ -457,7 +457,7 @@ def handle_result_files(session, files):
summary = JSONUtil.loads(files['summary']) summary = JSONUtil.loads(files['summary'])
# If database crashed on restart, pull latest result and worst throughput so far # If database crashed on restart, pull latest result and worst throughput so far
if 'error' in summary and summary['error']=="DB_RESTART_ERROR": if 'error' in summary and summary['error'] == "DB_RESTART_ERROR":
LOG.debug("Error in restarting database") LOG.debug("Error in restarting database")
# Find worst throughput # Find worst throughput
@ -467,13 +467,13 @@ def handle_result_files(session, files):
throughput = JSONUtil.loads(curr_config.data)[session.target_objective] throughput = JSONUtil.loads(curr_config.data)[session.target_objective]
metric_meta = target_objectives.get_instance( metric_meta = target_objectives.get_instance(
session.dbms.pk, session.target_objective) 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_throughput is None or throughput < worst_throughput: if worst_throughput is None or throughput < worst_throughput:
worst_throughput = throughput worst_throughput = throughput
else: else:
if worst_throughput is None or throughput > worst_throughput: if worst_throughput is None or throughput > worst_throughput:
worst_throughput = throughput worst_throughput = throughput
LOG.debug("Worst throughput so far is:%d",worst_throughput) LOG.debug("Worst throughput so far is:%d", worst_throughput)
result = Result.objects.filter(session=session).order_by("-id").first() result = Result.objects.filter(session=session).order_by("-id").first()
backup_data = BackupData.objects.filter(result=result).first() backup_data = BackupData.objects.filter(result=result).first()
@ -495,12 +495,14 @@ def handle_result_files(session, files):
for tunable_knob in last_conf.keys(): for tunable_knob in last_conf.keys():
if tunable_knob in knob: if tunable_knob in knob:
unit = KnobCatalog.objects.get(dbms=session.dbms, name=knob).unit 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: if unit == 1:
data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob], data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob],
ConversionUtil.DEFAULT_BYTES_SYSTEM) bytes_system)
elif unit == 2: elif unit == 2:
data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob], data_knobs[knob] = ConversionUtil.get_raw_size(last_conf[tunable_knob],
ConversionUtil.DEFAULT_TIME_SYSTEM) time_system)
else: else:
data_knobs[knob] = last_conf[tunable_knob] data_knobs[knob] = last_conf[tunable_knob]
@ -512,7 +514,7 @@ def handle_result_files(session, files):
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["throughput_txn_per_sec"]=worst_throughput metric_cpy["throughput_txn_per_sec"] = worst_throughput
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 + '*'