Try not using the busy timeout

I'm not quite sure what effect this will have, but it's probably better to do
the waiting in Guile rather than SQLite.

1 files changed, 2 insertions, 9 deletions

diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index 215c07e..be66ef5 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -144,7 +144,7 @@
       (lambda ()
         (let ((db
                (db-open database-file)))
-          (sqlite-exec db "PRAGMA busy_timeout = 5000;")
+          (sqlite-exec db "PRAGMA busy_timeout = 0;")
           (sqlite-exec db "PRAGMA synchronous = NORMAL;")
           (sqlite-exec db "PRAGMA temp_store = MEMORY;")
           (sqlite-exec db "PRAGMA foreign_keys = ON;")
@@ -209,7 +209,7 @@
         (let ((db
                (db-open database-file #:write? #f)))
           (sqlite-exec db "PRAGMA temp_store = MEMORY;")
-          (sqlite-exec db "PRAGMA busy_timeout = 4000;")
+          (sqlite-exec db "PRAGMA busy_timeout = 0;")
           (sqlite-exec db "PRAGMA cache_size = -16000;")
 
           (list db)))
@@ -288,11 +288,6 @@
           metrics-registry
           checkpoint-duration-metric-name
           (lambda ()
-            (if (> (wal-size) extreme-wal-size-threshold)
-                ;; Since the WAL is really getting too big, wait for much longer
-                (sqlite-exec db "PRAGMA busy_timeout = 300000;")
-                (sqlite-exec db "PRAGMA busy_timeout = 20;"))
-
             (let* ((statement
                     (sqlite-prepare
                      db
@@ -314,8 +309,6 @@
                               modified-page-count
                               pages-moved-to-db)
                              #t))))))
-              (sqlite-exec db "PRAGMA busy_timeout = 5000;")
-
               result)))
          #t))