Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quota: Add Cache To Tag Delete (PROJQUAY-3828) #1345

Merged
merged 3 commits into from
May 27, 2022
Merged

Quota: Add Cache To Tag Delete (PROJQUAY-3828) #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3d0fe4
Add Cache To Tag Delete
kwestpharedhat May 26, 2022
07391f7
cache using tags included
kwestpharedhat May 26, 2022
c0e3f38
fix formatting
kwestpharedhat May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions data/model/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
RepositorySize,
ManifestBlob,
BlobUpload,
Tag,
get_epoch_timestamp_ms,
)
from data.text import prefix_search
from util.itertoolrecipes import take
Expand Down Expand Up @@ -729,10 +731,19 @@ def get_size_during_upload(repo_id: int):

def force_cache_repo_size(repo_id: int):
try:
now_ms = get_epoch_timestamp_ms()
subquery = (
Tag.select(Tag.repository_id)
.where(Tag.hidden == False)
.where((Tag.lifetime_end_ms >> None) | (Tag.lifetime_end_ms > now_ms))
.group_by(Tag.repository_id)
.having(fn.Count(Tag.name) > 0)
)

cache = (
Manifest.select(fn.Sum(Manifest.layers_compressed_size).alias("size_bytes")).where(
Manifest.repository == repo_id
)
Manifest.select(fn.Sum(Manifest.layers_compressed_size).alias("size_bytes"))
.join(subquery, on=(subquery.c.repository_id == Manifest.repository_id))
.where(Manifest.repository == repo_id)
).scalar()

size = cache
Expand Down
6 changes: 5 additions & 1 deletion endpoints/api/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
from datetime import datetime
from flask import request, abort

from app import storage, docker_v2_signing_key
from app import storage, docker_v2_signing_key, app
from auth.auth_context import get_authenticated_user
from data.registry_model import registry_model
from data.model import repository as repository_model
from endpoints.api import (
resource,
deprecated,
Expand Down Expand Up @@ -229,6 +230,9 @@ def delete(self, namespace, repository, tag):

registry_model.delete_tag(repo_ref, tag)

if app.config.get("FEATURE_QUOTA_MANAGEMENT", False):
repository_model.force_cache_repo_size(repo_ref.id)

username = get_authenticated_user().username
log_action(
"delete_tag",
Expand Down