openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Close the http sessions of registry on image prepare" into stable/stein

This commit is contained in:
Zuul 2019-08-26 21:31:09 +00:00 committed by Gerrit Code Review
parent 4e6995dc44 6104789f3c
commit 8adc39b62d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/image/image_uploader.py
View File

@ -1091,6 +1091,7 @@ class PythonImageUploader(BaseImageUploader):
t.target_image, target_session):
LOG.warning('Skipping upload for modified image %s' %
t.target_image)
target_session.close()
return []
copy_target_url = t.target_image_source_tag_url
else:
@ -1170,6 +1171,9 @@ class PythonImageUploader(BaseImageUploader):
t.image_name)
for layer in source_layers:
self.image_layers.setdefault(layer, t.target_image_url)
target_session.close()
source_session.close()
return to_cleanup
@classmethod
@ -1877,6 +1881,7 @@ def discover_tag_from_inspect(args):
session = self.authenticate(
image_url, username=username, password=password)
i = self._inspect(image_url, session=session)
session.close()
if ':' in image_url.path:
# break out the tag from the url to be the fallback tag
path = image.rpartition(':')