From efa0692e5ac3c47719dc8940d65feaa5f26a568b Mon Sep 17 00:00:00 2001
From: Kenny Lee Sin Cheong <2530351+kleesc@users.noreply.github.com>
Date: Thu, 15 Apr 2021 16:09:58 -0400
Subject: [PATCH] gc: increment quay_gc_repos_purged for NamespaceGCWorker
 (PROJQUAY-1802) (#749)

Since NamespaceGCWorker does a superset of RepositoryGCWorker's
operations, make sure that quay_gc_repos_purged is incremented if
either workers deletes a repository.
---
 data/model/gc.py              |   3 ++-
 test/data/test.db             | Bin 1978368 -> 1978368 bytes
 util/metrics/prometheus.py    |   3 ++-
 workers/repositorygcworker.py |   3 ---
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/model/gc.py b/data/model/gc.py
index b6cd5ac32..b3da9b6ae 100644
--- a/data/model/gc.py
+++ b/data/model/gc.py
@@ -38,7 +38,7 @@ from data.database import (
     DerivedStorageForImage,
 )
 from data.database import TagManifestToManifest, TagToRepositoryTag, TagManifestLabelMap
-from util.metrics.prometheus import gc_table_rows_deleted
+from util.metrics.prometheus import gc_table_rows_deleted, gc_repos_purged
 
 
 logger = logging.getLogger(__name__)
@@ -144,6 +144,7 @@ def purge_repository(repo, force=False):
 
     try:
         fetched.delete_instance(recursive=True, delete_nullable=False, force=force)
+        gc_repos_purged.inc()
         return True
     except IntegrityError:
         return False
diff --git a/test/data/test.db b/test/data/test.db
index 0e815816985723cf03839233760dd0c11061d4d9..dd256dfffcdde6b84bb5a3ad965dd0d1af11a17d 100644
GIT binary patch
delta 391
zcmYk$u}cDB7{~GV&b!R_-sgR_vOM)X6KafXa!g#Kp`f-vc>jiQ5ITpK922plp+Sg-
zf|jUTT*RQUS{m!TQ3#rv9C~bO_-wx~&*Oy+FKnFUG`EwlnJ(F=japJkO-WtJn39H)
zrjm0?#+95`GVvhk<x5=b5nF2#pT5#9U2EQ#y=^UMzR`Cu2qAafvUg)r5fR%rLt09Y
z#Fa?!3H0C?4xs`zi&%uwHS<p@j_`NE5|3Xr(r0y{Q_W_m7!#Wfh-isAAM!qL@w%vr
zRX_VpOFH|(*ki$9O4nku#_d#dco3VOX|1P*qAxT)h7eBR2pn*5-e$oQvz-6)kJ*1o
z%gwM`)`m|Qzy&_I51Rn&nN8RPvmF++^VY#%R_d0$!g**Kr$*623<2Uupd?D61+<8k
XP#P_x6_i0X%Ay>~BPTG5g{k-j=dfsL

delta 541
zcma)&v1?ON6o=nU`fT5Q_q>~`ZPPX{o?fg=ZFzZ#5HlHsx`=~<ZpxFJmQb}&YpGaC
zBHTkp9m>POp&(rxMYCin3XavqQIm`X!9T#kmx80>bj}BdkKgY!d)v+4_VZbmf04Uv
z=dGm@wzSdA=#<fEqeqOkjXq)YsL^9aJMT1qb?8`@HN$o+c|9Kc%)_^Z<|WqI`NF?K
zt+l|o#T<uKt!GoqsW1qG#h|<x23ROpilxeh;!;?=SPBbI)LQMas-Rj~UsvZ*ZAJGU
z)rNdG+8A<OCs0V1`_Y5?O6}q19bI2d#_%Ne5B)2n>M0-Qi0vL%69f4{zLt)61iP>W
zx1bEuVvq#e7jdKP%lI0&^8F7!NX3JOH>v)lI5vo`C0jD`4!k|D<wde8=VU+5{^TkV
zG)1TTi_fRe=0}{W^Y=c-rd``TH{O>Aa!)d^4?SqWZSWIITXa4O*Z)6DY-ijvS@})8
z5pDPmU3i&Px&Z-z_#}=J+f~tN=iHlVHD|LbbN=z=WkQ!w5CWk`C<!x!<Af&(PZ6Fb
ZoFJSeoFdE;P7}@$&JyMb{e8@5egg<?ifsS@

diff --git a/util/metrics/prometheus.py b/util/metrics/prometheus.py
index 9a46eb745..9c4a2ef77 100644
--- a/util/metrics/prometheus.py
+++ b/util/metrics/prometheus.py
@@ -50,7 +50,8 @@ gc_storage_blobs_deleted = Counter(
 
 # GC iterations
 gc_repos_purged = Counter(
-    "quay_gc_repos_purged", "number of repositories purged by the RepositoryGCWorker"
+    "quay_gc_repos_purged",
+    "number of repositories purged by the RepositoryGCWorker or NamespaceGCWorker",
 )
 gc_namespaces_purged = Counter(
     "quay_gc_namespaces_purged", "number of namespaces purged by the NamespaceGCWorker"
diff --git a/workers/repositorygcworker.py b/workers/repositorygcworker.py
index 2088772c6..498951cc6 100644
--- a/workers/repositorygcworker.py
+++ b/workers/repositorygcworker.py
@@ -8,7 +8,6 @@ from data import model, database
 from workers.queueworker import QueueWorker, WorkerSleepException
 from util.log import logfile_path
 from util.locking import GlobalLock, LockNotAcquiredException
-from util.metrics.prometheus import gc_repos_purged
 from workers.gunicorn_worker import GunicornWorker
 
 logger = logging.getLogger(__name__)
@@ -48,8 +47,6 @@ class RepositoryGCWorker(QueueWorker):
         if not model.gc.purge_repository(marker.repository):
             raise Exception("GC interrupted; will retry")
 
-        gc_repos_purged.inc()
-
 
 def create_gunicorn_worker():
     """