diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-10-14 04:36:48 -0700 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-10-16 05:02:16 +0000 |
| commit | 52cac09d3d0b8dcdbc8d68a0bcc8092008220309 (patch) | |
| tree | 7036115811f219b9b745beb747ed5d5bcab07109 /kolla/image | |
| parent | 88d26e52d350683f4407191ccb196a203167e756 (diff) | |
| download | kolla-52cac09d3d0b8dcdbc8d68a0bcc8092008220309.tar.gz kolla-52cac09d3d0b8dcdbc8d68a0bcc8092008220309.zip | |
handle push error properly
If there was some error during pushing then Kolla was greeting with "all went
fine" message anyway:
INFO:kolla.common.utils.aodh-api:Trying to push the image
ERROR:kolla.common.utils.aodh-api:Get http://10.101.16.1:5000/v2/: dial tcp 10.101.16.1:5000: connect: no route to host
INFO:kolla.common.utils.aodh-api:Pushed successfully
This patch changes that. Now if there is an error during push then proper
exception is raised to PushTask and image is marked with PUSH_ERROR status.
This way at the end of build it is easy to spot which images did not got
pushed to registry:
INFO:kolla.common.utils:===========================
INFO:kolla.common.utils:Images that failed to build
INFO:kolla.common.utils:===========================
ERROR:kolla.common.utils:base Failed with status: push_error
ERROR:kolla.common.utils:nova-api Failed with status: push_error
ERROR:kolla.common.utils:nova-base Failed with status: push_error
ERROR:kolla.common.utils:nova-compute Failed with status: push_error
ERROR:kolla.common.utils:nova-compute-ironic Failed with status: push_error
ERROR:kolla.common.utils:nova-conductor Failed with status: push_error
Closes-Bug: #1848019
Change-Id: Id2ab97bf4c0dc3423268a0ea435b56f4a65f7196
Diffstat (limited to 'kolla/image')
| -rwxr-xr-x | kolla/image/build.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 102792408..0cd9274c5 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -321,6 +321,11 @@ class PushIntoQueueTask(task.Task): self.success = True +class PushError(Exception): + """Raised when there is a problem with pushing image to repository.""" + pass + + class PushTask(DockerTask): """Task that pushes an image to a docker repository.""" @@ -344,6 +349,9 @@ class PushTask(DockerTask): ' have the correct privileges to run Docker' ' (root)') image.status = STATUS_CONNECTION_ERROR + except PushError as exception: + self.logger.error(exception) + image.status = STATUS_PUSH_ERROR except Exception: self.logger.exception('Unknown error when pushing') image.status = STATUS_PUSH_ERROR @@ -368,8 +376,7 @@ class PushTask(DockerTask): if 'stream' in response: self.logger.info(response['stream']) elif 'errorDetail' in response: - image.status = STATUS_ERROR - self.logger.error(response['errorDetail']['message']) + raise PushError(response['errorDetail']['message']) # Reset any previous errors. image.status = STATUS_BUILT |