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

Merge pull request #875 from coreos-inc/imagediffdisable

Browse source 
Remove code that adds images to the image diff queue
This commit is contained in:
josephschorr 2015-11-13 12:49:09 -05:00
commit 44b44b19ac
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
endpoints/v1/registry.py
View file

@ -7,7 +7,7 @@ from functools import wraps
from datetime import datetime from datetime import datetime
from time import time from time import time
from app import storage as store, image_diff_queue, image_replication_queue, app from app import storage as store, image_replication_queue, app
from auth.auth import process_auth, extract_namespace_repo_from_session from auth.auth import process_auth, extract_namespace_repo_from_session
from auth.auth_context import get_authenticated_user, get_grant_user_context from auth.auth_context import get_authenticated_user, get_grant_user_context
from digest import checksums from digest import checksums
@ -60,20 +60,9 @@ def _finish_image(namespace, repository, repo_image):
# Checksum is ok, we remove the marker # Checksum is ok, we remove the marker
set_uploading_flag(repo_image, False) set_uploading_flag(repo_image, False)
image_id = repo_image.docker_image_id
# The layer is ready for download, send a job to the work queue to
# process it.
logger.debug('Adding layer to diff queue')
repo = model.repository.get_repository(namespace, repository)
image_diff_queue.put([repo.namespace_user.username, repository, image_id], json.dumps({
'namespace_user_id': repo.namespace_user.id,
'repository': repository,
'image_id': image_id,
}))
# Send a job to the work queue to replicate the image layer. # Send a job to the work queue to replicate the image layer.
if features.STORAGE_REPLICATION: if features.STORAGE_REPLICATION:
repo = model.repository.get_repository(namespace, repository)
image_replication_queue.put([repo_image.storage.uuid], json.dumps({ image_replication_queue.put([repo_image.storage.uuid], json.dumps({
'namespace_user_id': repo.namespace_user.id, 'namespace_user_id': repo.namespace_user.id,
'storage_id': repo_image.storage.uuid, 'storage_id': repo_image.storage.uuid,