lix-project/lix
18
45
Fork 24
Code Issues 315 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Warn after a second of being busy instead of immediately.

Browse source 
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).
This commit is contained in:
Ben Radford 2023-04-11 10:22:07 +01:00
parent 7f5ca6192d
commit 7c56e84213
No known key found for this signature in database
GPG key ID: 9DF5D4640AB888D5
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/sqlite.cc
View file

@ -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())
});

15
src/libstore/sqlite.hh
View file

@ -139,7 +139,7 @@ protected:
MakeError(SQLiteBusy, SQLiteError);
void handleSQLiteBusy(const SQLiteBusy & e);
void handleSQLiteBusy(const SQLiteBusy & e, bool shouldWarn);
/**
* Convenience function for retrying a SQLite transaction when the
@ -148,11 +148,22 @@ void handleSQLiteBusy(const SQLiteBusy & e);
template<typename T, typename F>
T retrySQLite(F && fun)
{
time_t nextWarning = time(0) + 1;
while (true) {
try {
return fun();
} catch (SQLiteBusy & e) {
handleSQLiteBusy(e);
time_t now = time(0);
bool shouldWarn = false;
if (now > nextWarning) {
nextWarning = now + 10;
shouldWarn = true;
}
handleSQLiteBusy(e, shouldWarn);
}
}
}