From 859b0093f87ad2bbe894a0a6129f55ff4d88601d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 8 Dec 2024 20:03:12 +0000 Subject: [PATCH] Avoid getting the load-new-guix-revision-inserts lock twice --- guix-data-service/jobs/load-new-guix-revision.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index c8f9564..24a24e4 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -1864,6 +1864,11 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1" (define postgresql-connection-pool (make-resource-pool (lambda () + (with-time-logging + "waiting for guix-revision-id" + ;; This uses the transaction lock, so wait until the transaction has + ;; committed + (fibers-force guix-revision-id-promise)) (with-time-logging "acquiring advisory transaction lock: load-new-guix-revision-inserts" ;; Wait until this is the only transaction inserting data, to