opendev/elastic-recheck
Code Issues Proposed changes

Use short build_uuids in elasticSearch queries

Browse Source 
In addition to searching by change and patch search by the short build_uuid.
This prevents us accidentally classifying multiple builds when we classify
a failure on gerrit. This can happen in the gate queue if there is a
gate reset, or if there are multiple 'recheck bug x' on a single patch
revision in the check queue.

Change-Id: I6356a971ca250ddf5f01a9734f13d0b080a62c89
This commit is contained in:
Joe Gordon
2014-01-17 17:40:46 -05:00
parent 1fa614169b
commit 8c57a4f639
4 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
elastic_recheck/query_builder.py
View File

@@ -59,7 +59,7 @@ def generic(raw_query, facet=None):
return query
def result_ready(review=None, patch=None, name=None):
def result_ready(review=None, patch=None, name=None, short_build_uuid=None):
"""A query to determine if we have a failure for a particular patch.
This is looking for a particular FAILURE line in the console log, which
@@ -70,11 +70,12 @@ def result_ready(review=None, patch=None, name=None):
'AND build_status:"FAILURE" '
'AND build_change:"%s" '
'AND build_patchset:"%s" '
'AND build_name:"%s"' %
(review, patch, name))
'AND build_name:"%s"'
'AND build_uuid:%s*' %
(review, patch, name, short_build_uuid))
def files_ready(review, patch):
def files_ready(review, patch, name, short_build_uuid):
"""A facetted query to ensure all the required files exist.
When changes are uploaded to elastic search there is a delay in
@@ -84,11 +85,14 @@ def files_ready(review, patch):
"""
return generic('build_status:"FAILURE" '
'AND build_change:"%s" '
'AND build_patchset:"%s"' % (review, patch),
'AND build_patchset:"%s"'
'AND build_name:"%s"'
'AND build_uuid:%s*' %
(review, patch, name, short_build_uuid),
facet='filename')
def single_patch(query, review, patch):
def single_patch(query, review, patch, short_build_uuid):
"""A query for a single patch (review + revision).
This is used to narrow down a particular kind of failure found in a
@@ -96,5 +100,6 @@ def single_patch(query, review, patch):
"""
return generic('%s '
'AND build_change:"%s" '
'AND build_patchset:"%s"' %
(query, review, patch))
'AND build_patchset:"%s"'
'AND build_uuid:%s*' %
(query, review, patch, short_build_uuid))