diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-04 21:13:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-04 21:13:50 +0000 |
| commit | 627de697e9d9a074ce7c180efd88ebeceb3664a3 (patch) | |
| tree | 16412a94a8689e76457a7a7b337307c1652bf10e | |
| parent | b058ab447e84a8b88ccb6ec5585742e31711490c (diff) | |
| parent | 6f125e56c66de0d275057eb485bb711751d31566 (diff) | |
| download | zuul-627de697e9d9a074ce7c180efd88ebeceb3664a3.tar.gz | |
Merge "Don't retry after Gerrit HTTP 409s"
| -rw-r--r-- | zuul/driver/gerrit/gerritconnection.py | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/zuul/driver/gerrit/gerritconnection.py b/zuul/driver/gerrit/gerritconnection.py index a75252ad9..0d0913789 100644 --- a/zuul/driver/gerrit/gerritconnection.py +++ b/zuul/driver/gerrit/gerritconnection.py @@ -48,6 +48,10 @@ from zuul.model import Ref, Tag, Branch, Project TIMEOUT = 30 +class HTTPConflictException(Exception): + message = "Received response 409" + + class GerritChangeData(object): """Compatability layer for SSH/HTTP @@ -613,7 +617,9 @@ class GerritConnection(BaseConnection): auth=self.auth, timeout=TIMEOUT, headers={'User-Agent': self.user_agent}) self.iolog.debug('Received: %s %s' % (r.status_code, r.text,)) - if r.status_code != 200: + if r.status_code == 409: + raise HTTPConflictException() + elif r.status_code != 200: raise Exception("Received response %s" % (r.status_code,)) ret = None if r.text and len(r.text) > 4: @@ -637,7 +643,9 @@ class GerritConnection(BaseConnection): headers={'Content-Type': 'application/json;charset=UTF-8', 'User-Agent': self.user_agent}) self.iolog.debug('Received: %s %s' % (r.status_code, r.text,)) - if r.status_code != 200: + if r.status_code == 409: + raise HTTPConflictException() + elif r.status_code != 200: raise Exception("Received response %s" % (r.status_code,)) ret = None if r.text and len(r.text) > 4: @@ -1065,6 +1073,9 @@ class GerritConnection(BaseConnection): (changeid, change.commit, uuid), checkinfo) break + except HTTPConflictException: + log.exception("Conflict submitting check data to gerrit.") + break except Exception: log.exception("Error submitting check data to gerrit, " "attempt %s", x) @@ -1108,6 +1119,9 @@ class GerritConnection(BaseConnection): (changeid, change.commit), data) break + except HTTPConflictException: + log.exception("Conflict submitting data to gerrit.") + break except Exception: log.exception( "Error submitting data to gerrit, attempt %s", x) @@ -1117,6 +1131,9 @@ class GerritConnection(BaseConnection): try: self.post('changes/%s/submit' % (changeid,), {}) break + except HTTPConflictException: + log.exception("Conflict submitting data to gerrit.") + break except Exception: log.exception( "Error submitting data to gerrit, attempt %s", x) @@ -1261,7 +1278,9 @@ class GerritConnection(BaseConnection): auth=self.auth, timeout=TIMEOUT, headers={'User-Agent': self.user_agent}) self.iolog.debug('Received: %s %s' % (r.status_code, r.text,)) - if r.status_code != 200: + if r.status_code == 409: + raise HTTPConflictException() + elif r.status_code != 200: raise Exception("Received response %s" % (r.status_code,)) out = r.text[r.text.find('\n') + 5:] else: |