Merge lp:~freyes/simplestreams/lp1630744 into lp:simplestreams

[Felipe Reyes]

mirrors/glance: when deleting an image silently discard 404 error

This may happen when glance detected the image is not available in the
storage backend anymore and marked it as deleted. Without this patch syncing
process is aborted.

[Scott Moser (smoser)]

seems sane, one small request.

[lp:~freyes/simplestreams/lp1630744]

450. By Felipe Reyes on 2016-12-14

Log image id and exception when delete op fails

[Felipe Reyes (freyes)]

Scott, pushed a new commit addressing your feedback. Thanks for reviewing this.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:450
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~freyes/simplestreams/lp1630744/+merge/312704/+edit-commit-message

https://jenkins.ubuntu.com/server/job/simplestreams-ci/34/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/34
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/34
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/34
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/34
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=vm-i386/34

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Is this still necessary?

review: Needs Information

[Felipe Reyes (freyes)]

it is, the behavior on glance side hasn't changed.

[Scott Moser (smoser)]

Hi.
We've moved simplestreams from bzr on launchpad to git on launchpad.
I'm going to mark this merge proposal as Rejected based only on
the fact that it is a bzr based merge proposal.

Please feel free to re-submit the merge proposal using the launchpad git.
Hopefully the cloud-init doc at
 http://cloudinit.readthedocs.io/en/latest/topics/hacking.html
should give you an idea on how to do that.

Unmerged revisions

450. By Felipe Reyes on 2016-12-14

Log image id and exception when delete op fails

449. By Felipe Reyes on 2016-12-07

mirrors/glance: when deleting an image silently discard 404 error

This may happen when glance detected the image is not available in the
storage backend anymore and marked it as deleted. Without this patch syncing
process is aborted.

=== modified file 'simplestreams/mirrors/glance.py'
--- simplestreams/mirrors/glance.py	2016-06-14 20:21:05 +0000
+++ simplestreams/mirrors/glance.py	2016-12-14 20:36:27 +0000
@@ -25,6 +25,7 @@
 import copy
 import errno
 import glanceclient
+import glanceclient.exc
 import json
 import os
 import re
@@ -469,7 +470,13 @@
         util.products_del(target, pedigree)
         if 'id' in data:
             print("removing %s: %s" % (data['id'], data['name']))
-            self.gclient.images.delete(data['id'])
+            try:
+                self.gclient.images.delete(data['id'])
+            except glanceclient.exc.HTTPNotFound as ex:
+                # This may happen when glance detected the image is not
+                # available in the storage backend anymore and marked it
+                # as deleted
+                LOG.warn("Failed to delete image id=%s: %s", id, ex)
 
     def filter_index_entry(self, data, src, pedigree):
         return filters.filter_dict(self.index_filters, data)