This repository has been archived by the owner on Sep 12, 2022. It is now read-only.
Fixes for application_to_provider Glance client v1 native (non-iRODS) upload method #618
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c-mart
changed the title
cdosborn
reviewed
May 17, 2018
scripts/application_to_provider.py
Outdated
| @@ -577,7 +580,11 @@ def migrate_image_data_glance(src_glance_client, dst_glance_client, img_uuid, lo | |||
| logging.debug("Attempting to upload image data to destination provider") | |||
| with open(local_path, 'rb') as img_file: | |||
| try: | |||
| dst_glance_client.images.upload(img_uuid, img_file) | |||
| # "Upload" method is different for Glance client v1, than for v2 | |||
| if isinstance(dst_glance_client, glanceclient.v1.client.Client): | |||
There was a problem hiding this comment.
Sort of minor, did a bit of reading to confirm this, you have the option to do type(dst_glance_client) is glanceclient.v1.client.Client. If the v2 client was a subclass of the v1 client, then your check wouldn't work as intended. isinstance is typically preferred, because of duck typing (when you want to check if an instance has at minimum the behavior of some class and its parents), but in cases like this I think the preferred approach is to check for an exact class match.
There was a problem hiding this comment.
sound reasonable, change made as suggested
cdosborn
force-pushed
the
app-to-provider-glanceclient-v1-fixes
branch
from
fe31d74
to
e7e7370
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Glance Client v1 uses a different method for uploading image data; this PR accommodates that.
This codepath was previously untested with Glance Client v1 because we were using the "direct iRODS transfer" mode of application_to_provider. We recently stopped using that (because Marana Cloud Glance is now backed by Ceph), and this bug surfaced.
Also, apparently in Glance API v1, it is valid for an image's checksum to be missing even though that image is in active state; we can catch this and log a warning.
Checklist before merging Pull Requests
roles/sanitary-sql-access/templates/sanitize-dump.sh.j2