philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #8199 from tweag/fix-sqlite-busy-reporting

Browse source 
Fix unnecessary reporting of SQLite busy errors
This commit is contained in:
Eelco Dolstra 2023-04-14 10:50:50 +02:00 committed by GitHub
parent 33fc09c2a5 de3df3009b
commit 7eac8838df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 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,11 @@ SQLiteTxn::~SQLiteTxn()
} }
} }
void handleSQLiteBusy(const SQLiteBusy & e) void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning)
{ {
static std::atomic<time_t> lastWarned{0};
time_t now = time(0); time_t now = time(0);
if (now > nextWarning) {
if (now > lastWarned + 10) { nextWarning = now + 10;
lastWarned = now;
logWarning({ logWarning({
.msg = hintfmt(e.what()) .msg = hintfmt(e.what())
}); });

6
src/libstore/sqlite.hh
View file

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