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

Only write exceptions for manifest gen when a tag exists

Browse source 
Fixes #1019

Currently, we just raise an exception to the logs regardless, which can make it appear as if there is an issue (when there isn't).
This commit is contained in:
Joseph Schorr 2015-12-03 16:04:17 -05:00
parent 597d6ecd3c
commit c324ebd7f6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/model/tag.py
View file

@ -223,7 +223,7 @@ def store_tag_manifest(namespace, repo_name, tag_name, docker_image_id, manifest
return TagManifest.create(tag=tag, digest=manifest_digest, json_data=manifest_data) return TagManifest.create(tag=tag, digest=manifest_digest, json_data=manifest_data)
def _get_active_tag(namespace, repo_name, tag_name): def get_active_tag(namespace, repo_name, tag_name):
return _tag_alive(RepositoryTag return _tag_alive(RepositoryTag
.select() .select()
.join(Image) .join(Image)
@ -235,7 +235,7 @@ def _get_active_tag(namespace, repo_name, tag_name):
def associate_generated_tag_manifest(namespace, repo_name, tag_name, manifest_digest, def associate_generated_tag_manifest(namespace, repo_name, tag_name, manifest_digest,
manifest_data): manifest_data):
tag = _get_active_tag(namespace, repo_name, tag_name) tag = get_active_tag(namespace, repo_name, tag_name)
return TagManifest.create(tag=tag, digest=manifest_digest, json_data=manifest_data) return TagManifest.create(tag=tag, digest=manifest_digest, json_data=manifest_data)

6
endpoints/v2/manifest.py
View file

@ -17,6 +17,7 @@ from endpoints.trackhelper import track_and_log
from endpoints.notificationhelper import spawn_notification from endpoints.notificationhelper import spawn_notification
from digest import digest_tools from digest import digest_tools
from data import model from data import model
from data.database import RepositoryTag
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -217,6 +218,11 @@ def fetch_manifest_by_tagname(namespace, repo_name, manifest_ref):
try: try:
manifest = model.tag.load_tag_manifest(namespace, repo_name, manifest_ref) manifest = model.tag.load_tag_manifest(namespace, repo_name, manifest_ref)
except model.InvalidManifestException: except model.InvalidManifestException:
try:
model.tag.get_active_tag(namespace, repo_name, manifest_ref)
except RepositoryTag.DoesNotExist:
raise ManifestUnknown()
try: try:
manifest = _generate_and_store_manifest(namespace, repo_name, manifest_ref) manifest = _generate_and_store_manifest(namespace, repo_name, manifest_ref)
except model.DataModelException: except model.DataModelException: