vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the garbage collect method to remove unused old images.

Browse source
This commit is contained in:
jakedt 2014-02-17 14:38:35 -05:00
parent e7064f1191
commit 7428d2aa50
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/model.py
View file

@ -1011,15 +1011,19 @@ def garbage_collect_repository(namespace_name, repository_name):
uuids_to_check_for_gc = set() uuids_to_check_for_gc = set()
for image_id_to_remove in to_remove: for image_id_to_remove in to_remove:
image_to_remove = all_images[image_id_to_remove] image_to_remove = all_images[image_id_to_remove]
image_to_remove.delete_instance()
if not image_to_remove.storage: if not image_to_remove.storage or not image_to_remove.storage.id:
image_path = store.image_path(namespace_name, repository_name, image_path = store.image_path(namespace_name, repository_name,
image_to_remove.docker_image_id, None) image_to_remove.docker_image_id, None)
logger.debug('Deleting image storage: %s', image_path) logger.debug('Deleting image storage: %s', image_path)
store.remove(image_path)
else: else:
logger.debug('Adding image storage to the gc list: %s',
image_to_remove.storage.uuid)
uuids_to_check_for_gc.add(image_to_remove.storage.uuid) uuids_to_check_for_gc.add(image_to_remove.storage.uuid)
image_to_remove.delete_instance()
storage_to_remove = (ImageStorage storage_to_remove = (ImageStorage
.select() .select()
.join(Image, JOIN_LEFT_OUTER) .join(Image, JOIN_LEFT_OUTER)
@ -1139,7 +1143,7 @@ def delete_all_repository_tags(namespace_name, repository_name):
except Repository.DoesNotExist: except Repository.DoesNotExist:
raise DataModelException('Invalid repository \'%s/%s\'' % raise DataModelException('Invalid repository \'%s/%s\'' %
(namespace_name, repository_name)) (namespace_name, repository_name))
RepositoryTag.delete().where(RepositoryTag.repository == repo).execute() RepositoryTag.delete().where(RepositoryTag.repository == repo.id).execute()
def __entity_permission_repo_query(entity_id, entity_table, def __entity_permission_repo_query(entity_id, entity_table,