Warn after a second of being busy instead of immediately.

Getting the occasional SQLITE_BUSY is expected when the database is being
accessed concurrently. The retry will likely succeed so it is pointless to warn
immediately. Instead we track how long each retrySQLite block has been running,
and only begin warning after a second has elapsed (and then every 10 seconds
subsequently).

1 files changed, 2 insertions, 7 deletions

diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index 871f2f3be..c57e58fe0 100644
--- a/src/libstore/sqlite.cc
+++ b/src/libstore/sqlite.cc
@@ -239,14 +239,9 @@ SQLiteTxn::~SQLiteTxn()
     }
 }
 
-void handleSQLiteBusy(const SQLiteBusy & e)
+void handleSQLiteBusy(const SQLiteBusy & e, bool shouldWarn)
 {
-    static std::atomic<time_t> lastWarned{0};
-
-    time_t now = time(0);
-
-    if (now > lastWarned + 10) {
-        lastWarned = now;
+    if (shouldWarn) {
         logWarning({
             .msg = hintfmt(e.what())
         });