guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: turn LocalStore::dbPool into a mutex

Browse Source 
this reverts commit 749a323597. the pool
does hurt performance and concurreny, so let's revert now that we can.

Change-Id: I0b154cf04d14fa2cb4d2028f9cc865e463cd2265
This commit is contained in:
eldritch horrors
2025-03-05 23:07:20 +01:00
parent 166860fbc6
commit f61bcc6ca9
2 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libstore/local-store.cc
+19 -26
View File
@@ -184,12 +184,6 @@ static void migrateCASchema(SQLite& db, Path schemaPath, AutoCloseFD& lockFd, Ne
LocalStore::LocalStore(LocalStoreConfig config)
: Store(config)
, config_(std::move(config))
, dbPool(std::numeric_limits<size_t>::max(), [this] {
auto state = make_ref<DBState>();
openDB(*state, false);
prepareStatements(*state);
return state;
})
, dbDir(config_.stateDir + "/db")
, linksDir(config_.realStoreDir + "/.links")
, reservedSpacePath(dbDir + "/reserved")
@@ -198,6 +192,9 @@ LocalStore::LocalStore(LocalStoreConfig config)
, fnTempRoots(fmt("%s/%d", tempRootsDir, getpid()))
, locksHeld(tokenizeString<PathSet>(getEnv("NIX_HELD_LOCKS").value_or("")))
{
auto state(_dbState.lockSync(always_progresses));
state->stmts = std::make_unique<DBState::Stmts>();
/* Create missing state directories if they don't already exist. */
createDirs(config_.realStoreDir);
if (config_.readOnly) {
@@ -295,13 +292,11 @@ LocalStore::LocalStore(LocalStoreConfig config)
lockFile(globalLock.get(), ltRead, always_progresses);
}
initDB();
initDB(*state);
}
void LocalStore::initDB()
void LocalStore::initDB(DBState & state)
{
DBState state;
/* Check the current database schema and if necessary do an
upgrade. */
int curSchema = getSchema();
@@ -393,8 +388,6 @@ void LocalStore::initDB()
void LocalStore::prepareStatements(DBState & state)
{
state.stmts = std::make_unique<DBState::Stmts>();
/* Prepare SQL statements. */
state.stmts->RegisterValidPath = state.db.create(
"insert into ValidPaths (path, hash, registrationTime, deriver, narSize, ultimate, sigs, ca) values (?, ?, ?, ?, ?, ?, ?, ?);");
@@ -792,7 +785,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<void>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
if (auto oldR = queryRealisation_(*state, info.id)) {
if (info.isCompatibleWith(*oldR)) {
auto combinedSignatures = oldR->signatures;
@@ -923,7 +916,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
retrySQLite([&]() -> kj::Promise<Result<std::shared_ptr<const ValidPathInfo>>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
co_return queryPathInfoInternal(*state, path);
} catch (...) {
co_return result::current_exception();
@@ -1019,7 +1012,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
co_return TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<bool>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
co_return isValidPath_(*state, path);
} catch (...) {
co_return result::current_exception();
@@ -1047,7 +1040,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
co_return TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<StorePathSet>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
auto use(state->stmts->QueryValidPaths.use());
StorePathSet res;
while (use.next()) res.insert(parseStorePath(use.getStr(0)));
@@ -1076,7 +1069,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<void>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
queryReferrers(*state, path, referrers);
co_return result::success();
} catch (...) {
@@ -1094,7 +1087,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
co_return TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<StorePathSet>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
auto useQueryValidDerivers(state->stmts->QueryValidDerivers.use()(printStorePath(path)));
@@ -1119,7 +1112,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
retrySQLite([&]() -> kj::Promise<Result<std::map<std::string, std::optional<StorePath>>>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
std::map<std::string, std::optional<StorePath>> outputs;
uint64_t drvId;
drvId = queryValidPathId(*state, path);
@@ -1147,7 +1140,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
co_return TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<std::optional<StorePath>>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
auto useQueryPathFromHashPart(state->stmts->QueryPathFromHashPart.use()(prefix));
@@ -1219,7 +1212,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
co_return co_await retrySQLite([&]() -> kj::Promise<Result<void>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
SQLiteTxn txn = state->db.beginTransaction(SQLiteTxnType::Immediate);
StorePathSet paths;
@@ -1652,7 +1645,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<void>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
SQLiteTxn txn = state->db.beginTransaction(SQLiteTxnType::Immediate);
@@ -1783,7 +1776,7 @@ try {
}
if (update) {
auto state = TRY_AWAIT(dbPool.get());
auto state(co_await _dbState.lock());
updatePathInfo(*state, *info);
}
@@ -1839,7 +1832,7 @@ try {
if (canInvalidate) {
printInfo("path '%s' disappeared, removing from database...", pathS);
auto state = TRY_AWAIT(dbPool.get());
auto state(co_await _dbState.lock());
TRY_AWAIT(invalidatePath(*state, path));
} else {
printError("path '%s' disappeared, but it still has valid referrers!", pathS);
@@ -1880,7 +1873,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<void>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
SQLiteTxn txn = state->db.beginTransaction(SQLiteTxnType::Immediate);
@@ -1988,7 +1981,7 @@ try {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
TRY_AWAIT(retrySQLite([&]() -> kj::Promise<Result<std::optional<const Realisation>>> {
try {
auto state = TRY_AWAIT(dbPool.get());
auto state = co_await _dbState.lock();
co_return queryRealisation_(*state, id);
} catch (...) {
co_return result::current_exception();
lix/libstore/local-store.hh
+2 -5
View File
@@ -6,7 +6,6 @@
#include "lix/libstore/store-api.hh"
#include "lix/libstore/indirect-root-store.hh"
#include "lix/libutil/async-io.hh"
#include "lix/libutil/pool.hh"
#include "lix/libutil/sync.hh"
#include "lix/libutil/types.hh"
@@ -107,9 +106,7 @@ private:
std::unique_ptr<Stmts> stmts;
};
// NOTE this pool is unbounded during the async transition phase.
// we may want to bound it again later, and make Pool async also.
Pool<DBState> dbPool;
Sync<DBState, AsyncMutex> _dbState;
struct GCState
{
@@ -346,7 +343,7 @@ private:
*/
int getSchema();
void initDB();
void initDB(DBState & state);
void openDB(DBState & state, bool create);
void prepareStatements(DBState & state);