fix: comments review

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

services/apps/packages_worker/src/maven/backfillRepositoryUrl.ts

@@ -7,7 +7,7 @@ import { QueryExecutor } from '@crowd/data-access-layer/src/queryExecutor'
 import { getServiceChildLogger } from '@crowd/logging'
 
 import { normalizeScmUrl } from './extract'
-import { writeRepoLink } from './runMavenEnrichmentLoop'
+import { withDeadlockRetry, writeRepoLink } from './runMavenEnrichmentLoop'
 
 const log = getServiceChildLogger('maven-repo-url-backfill')
 
@@ -102,13 +102,15 @@ export async function backfillMavenRepositoryUrls(
       // re-run the row is skipped (its repository_url already matches `desired`),
       // so the inconsistency would never be repaired. On rollback the row stays
       // unchanged and is reprocessed on the next run.
-      await qx.tx(async (t) => {
-        await updateMavenRepositoryUrls(t, updates)
-        await deleteMavenPackageRepoLinks(t, pruneTargets)
-        for (const target of linkTargets) {
-          await writeRepoLink(t, target.id, target.repositoryUrl)
-        }
-      })
+      await withDeadlockRetry(() =>
+        qx.tx(async (t) => {
+          await updateMavenRepositoryUrls(t, updates)
+          await deleteMavenPackageRepoLinks(t, pruneTargets)
+          for (const target of linkTargets) {
+            await writeRepoLink(t, target.id, target.repositoryUrl)
+          }
+        }),
+      )
       totals.pruned += pruneTargets.length
       totals.linked += linkTargets.length
     }

services/apps/packages_worker/src/maven/runMavenEnrichmentLoop.ts

@@ -72,7 +72,7 @@ export async function writeRepoLink(qx: QueryExecutor, packageId: number, reposi
 // rows (e.g. maintainer 'hboutemy' across many org.apache packages, or the shared apache repo)
 // can form a lock cycle. Re-running the whole transaction resolves it — the upserts are idempotent.
 // prettier-ignore
-async function withDeadlockRetry<T>(fn: () => Promise<T>, maxAttempts = 4): Promise<T> {
+export async function withDeadlockRetry<T>(fn: () => Promise<T>, maxAttempts = 4): Promise<T> {
   for (let attempt = 1; ; attempt++) {
     try {
       return await fn()