docker/quay
1
0
Fork 0
mirror of https://github.com/quay/quay.git synced 2026-01-26 06:21:37 +03:00
Code Activity

workers(quotaregistrysize): fixed wrong condition to run quotasizeworker from PROJQUAY-8086 (PROJQUAY-9460) (#4313)

Browse Source 
PROJQUAY-9460 (fix): Total Registry Size Calculation return 0 KB and always queued
This commit is contained in:
Michaela Lang
2025-09-26 15:35:02 +02:00
committed by GitHub
parent 6d2e3fb1c4
commit 01908d64db
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workers/quotaregistrysizeworker.py
View File

@@ -39,7 +39,7 @@ if __name__ == "__main__":
time.sleep(100000)
# Registry size is only viewable by superusers, don't calculate if not used
if not all(
if not any(
[
any(
[

15
workers/test/test_quotaregistrysizeworker.py
View File

@@ -4,6 +4,10 @@ import features
from test.fixtures import *
from workers.quotaregistrysizeworker import QuotaRegistrySizeWorker
# since all checks are happening only when the worker is the main process `if __name__ == "__main__:`
# we need to re-implement the call/not-call logic as duplicate.
# Considering to move it into the `_calculate_registry_size` instead is dropped as dependencies are not clear
def test_registrysizeworker(initialized_db):
with patch(
@@ -31,6 +35,7 @@ def test_registrysizeworker_recovery(initialized_db):
def test_registrysizeworker_no_quotamanagement(initialized_db):
# we expect to fail since we do not have quota management enabled
features.QUOTA_MANAGEMENT = False
features.SUPER_USERS = True
app.config.update({"SUPER_USERS": ["someone"]})
if features.QUOTA_MANAGEMENT:
with patch(
@@ -43,8 +48,10 @@ def test_registrysizeworker_no_quotamanagement(initialized_db):
def test_registrysizeworker_no_superusers(initialized_db):
# we expect to fail since we do not have any superusers
app.config.update({"SUPER_USERS": [""]})
if features.QUOTA_MANAGEMENT:
features.QUOTA_MANAGEMENT = True
features.SUPER_USERS = True
app.config.update({"SUPER_USERS": []})
if all([features.QUOTA_MANAGEMENT, features.SUPER_USERS, len(app.config["SUPER_USERS"]) > 0]):
with patch(
"workers.quotaregistrysizeworker.calculate_registry_size", MagicMock()
) as mock_calculate_registry_size:
@@ -55,9 +62,11 @@ def test_registrysizeworker_no_superusers(initialized_db):
def test_registrysizeworker_ldap_superusers(initialized_db):
# we expect to succeed since LDAP_SUPERUSERS_FILTER is not empty
features.QUOTA_MANAGEMENT = False
features.SUPER_USERS = True
app.config.update({"LDAP_SUPERUSER_FILTER": "(objectClass=*)"})
app.config.update({"SUPER_USERS": []})
if not all(
if not any(
[
any(
[