x/browbeat
Code Issues Proposed changes

Merge "Index failed Shaker runs also with Run id"

Browse Source
This commit is contained in:
Jenkins 2016-09-12 23:29:13 +00:00 committed by Gerrit Code Review
commit e0a723fada
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Shaker.py
View File

@ -98,11 +98,11 @@ class Shaker(WorkloadBase.WorkloadBase):
'browbeat_scenario': browbeat_scenario, 'browbeat_scenario': browbeat_scenario,
'shaker_uuid': str(shaker_uuid), 'shaker_uuid': str(shaker_uuid),
'record': record, 'record': record,
'run': run 'browbeat_rerun': run
} }
result = self.elastic.combine_metadata(shaker_stats) result = self.elastic.combine_metadata(shaker_stats)
self.elastic.index_result(result) self.elastic.index_result(result, _type='error')
return return
# Dictionary to capture common test data # Dictionary to capture common test data
shaker_test_meta = {} shaker_test_meta = {}
@ -160,7 +160,7 @@ class Shaker(WorkloadBase.WorkloadBase):
# record afterrecord after flattening out data # record afterrecord after flattening out data
shaker_stats = { shaker_stats = {
'record': data['records'][record], 'record': data['records'][record],
'run': run, 'browbeat_rerun': run,
'shaker_test_info': shaker_test_meta['shaker_test_info'], 'shaker_test_info': shaker_test_meta['shaker_test_info'],
'timestamp': elastic_timestamp, 'timestamp': elastic_timestamp,
'accommodation': shaker_test_meta['deployment']['accommodation'], 'accommodation': shaker_test_meta['deployment']['accommodation'],
@ -178,6 +178,7 @@ class Shaker(WorkloadBase.WorkloadBase):
# shaker_stats dictionary to ES # shaker_stats dictionary to ES
shaker_stats = { shaker_stats = {
'record': data['records'][record], 'record': data['records'][record],
'browbeat_rerun': run,
'shaker_test_info': shaker_test_meta['shaker_test_info'], 'shaker_test_info': shaker_test_meta['shaker_test_info'],
'timestamp': str(es_ts).replace(" ", "T"), 'timestamp': str(es_ts).replace(" ", "T"),
'accommodation': shaker_test_meta['deployment']['accommodation'], 'accommodation': shaker_test_meta['deployment']['accommodation'],
@ -186,7 +187,7 @@ class Shaker(WorkloadBase.WorkloadBase):
'grafana_url': [self.grafana.grafana_urls()], 'grafana_url': [self.grafana.grafana_urls()],
'shaker_uuid': str(shaker_uuid)} 'shaker_uuid': str(shaker_uuid)}
result = self.elastic.combine_metadata(shaker_stats) result = self.elastic.combine_metadata(shaker_stats)
self.elastic.index_result(result) self.elastic.index_result(result, _type='error')
def set_scenario(self, scenario, fname, default_time): def set_scenario(self, scenario, fname, default_time):
stream = open(fname, 'r') stream = open(fname, 'r')