x
/
kloudbuster
Code Issues Proposed changes

Fix the issue of performing back-to-back progression run 

1. Fix the issue of performing back-to-back progression run;
2. Enhance the error handling logic for latency_stats;

Change-Id: Ica85744d8acd5bafd028a417a9e82c9acccefb9f
This commit is contained in:
Yichen Wang 2015-10-08 20:41:12 -07:00
parent 1c96ac5185
commit 9758210c91
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
kloudbuster/kb_runner.py
View File

@ -275,7 +275,9 @@ class KBRunner(object):
len(self.client_dict) * self.config.http_tool_configs.rate_limit
self.tool_result['total_connections'] =\
len(self.client_dict) * self.config.http_tool_configs.connections
self.tool_result['total_client_vms'] = active_range[1] - active_range[0] + 1
vm_count = active_range[1] - active_range[0] + 1\
if active_range else len(self.full_client_dict)
self.tool_result['total_client_vms'] = vm_count
self.tool_result['total_server_vms'] = self.tool_result['total_client_vms']
# self.tool_result['host_stats'] = self.gen_host_stats()
except KBSetStaticRouteException:
@ -286,26 +288,22 @@ class KBRunner(object):
raise KBException("Error while running HTTP benchmarking tool.")
def run(self, http_test_only=False):
# Resources are already staged, just re-run the HTTP benchmarking tool
if http_test_only:
self.single_run(http_test_only=True)
yield self.tool_result
return
try:
LOG.info("Waiting for agents on VMs to come up...")
self.wait_for_vm_up()
if not self.agent_version:
self.agent_version = "0"
if (LooseVersion(self.agent_version) != LooseVersion(self.expected_agent_version)):
# only warn once for each unexpected VM version
if self.expected_agent_version not in vm_version_mismatches:
if not http_test_only:
# Resources are already staged, just re-run the HTTP benchmarking tool
try:
LOG.info("Waiting for agents on VMs to come up...")
self.wait_for_vm_up()
if not self.agent_version:
self.agent_version = "0"
if (LooseVersion(self.agent_version) != LooseVersion(self.expected_agent_version))\
and (self.expected_agent_version not in vm_version_mismatches):
# only warn once for each unexpected VM version
vm_version_mismatches.add(self.expected_agent_version)
LOG.warn("The VM image you are running (%s) is not the expected version (%s) "
"this may cause some incompatibilities" %
(self.agent_version, self.expected_agent_version))
except KBVMUpException:
raise KBException("Some VMs failed to start.")
except KBVMUpException:
raise KBException("Some VMs failed to start.")
if self.config.progression.enabled:
start = self.config.progression.vm_start
@ -323,7 +321,7 @@ class KBRunner(object):
target_vm_count = start + (cur_stage - 1) * step
if target_vm_count > len(self.full_client_dict):
break
if self.tool_result:
if self.tool_result and 'latency_stats' in self.tool_result:
err = self.tool_result['http_sock_err']
pert_dict = dict(self.tool_result['latency_stats'])
if limit[1] in pert_dict.keys():
@ -340,11 +338,12 @@ class KBRunner(object):
self.client_dict[vm_list[idx]] = self.full_client_dict[vm_list[idx]]
description = "-- %s --" % self.header_formatter(cur_stage, len(self.client_dict))
LOG.info(description)
self.single_run(active_range=[0, target_vm_count - 1])
self.single_run(active_range=[0, target_vm_count - 1],
http_test_only=http_test_only)
LOG.info('-- Stage %s: %s --' % (cur_stage, str(self.tool_result)))
self.tool_result['description'] = description
cur_stage += 1
yield self.tool_result
else:
self.single_run()
self.single_run(http_test_only=http_test_only)
yield self.tool_result

10
kloudbuster/wrk_tool.py
View File

@ -84,6 +84,7 @@ class WrkTool(PerfTool):
@staticmethod
def consolidate_results(results):
err_flag = False
all_res = {'tool': 'wrk2'}
total_count = len(results)
if not total_count:
@ -103,13 +104,20 @@ class WrkTool(PerfTool):
all_res['latency_stats'] = []
histogram = HdrHistogram(1, 24 * 3600 * 1000 * 1000, 2)
for item in results:
histogram.decode_and_add(item['results']['latency_stats'])
if 'latency_stats' in item['results']:
histogram.decode_and_add(item['results']['latency_stats'])
else:
err_flag = True
perc_list = [50, 75, 90, 99, 99.9, 99.99, 99.999]
latency_dict = histogram.get_percentile_to_value_dict(perc_list)
for key, value in latency_dict.iteritems():
all_res['latency_stats'].append([key, value])
all_res['latency_stats'].sort()
if err_flag:
LOG.warn('Unable to find latency_stats from the result dictionary, this '
'may indicate that the test application on VM exited abnormally.')
return all_res
@staticmethod