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

amend last commit

This commit is contained in:
yangdsh 2020-04-15 00:13:29 +00:00 committed by Dana Van Aken
parent 9361e0d1ab
commit ec67e739d8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -661,10 +661,10 @@ def handle_result_files(session, files, execution_times=None):
# Normalize metrics by the amount of work # Normalize metrics by the amount of work
if '*' not in metric_data.name and 'transaction_counter' in numeric_metric_dict.keys(): if '*' not in metric_data.name and 'transaction_counter' in numeric_metric_dict.keys():
# Find the first valid result as the base # Find the first valid result as the base
for metric_data in MetricData.objects.filter(session=session): for prev_metric in MetricData.objects.filter(session=session):
if '*' in metric_data.name: if '*' in prev_metric.name:
continue continue
first_metric_data = JSONUtil.loads(metric_data.data) first_metric_data = JSONUtil.loads(prev_metric.data)
first_transaction_counter = first_metric_data['transaction_counter'] first_transaction_counter = first_metric_data['transaction_counter']
transaction_counter = numeric_metric_dict['transaction_counter'] transaction_counter = numeric_metric_dict['transaction_counter']
ratio = transaction_counter / first_transaction_counter ratio = transaction_counter / first_transaction_counter
@ -674,6 +674,7 @@ def handle_result_files(session, files, execution_times=None):
numeric_metric_dict[name] = numeric_metric_dict[name] / ratio numeric_metric_dict[name] = numeric_metric_dict[name] / ratio
metric_data.data = JSONUtil.dumps(numeric_metric_dict) metric_data.data = JSONUtil.dumps(numeric_metric_dict)
metric_data.save() metric_data.save()
break
# Create a new workload if this one does not already exist # Create a new workload if this one does not already exist
workload = Workload.objects.create_workload( workload = Workload.objects.create_workload(