max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 14:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not attempt to acquire big-lock when read-only.

Browse source
This commit is contained in:
Ben Radford 2023-05-16 13:53:31 +01:00
parent 79583c2d38
commit 50bbdc65c8
No known key found for this signature in database
GPG key ID: 9DF5D4640AB888D5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libstore/local-store.cc
View file

@ -271,10 +271,12 @@ LocalStore::LocalStore(const Params & params)
/* Acquire the big fat lock in shared mode to make sure that no /* Acquire the big fat lock in shared mode to make sure that no
schema upgrade is in progress. */ schema upgrade is in progress. */
Path globalLockPath = dbDir + "/big-lock"; if (!readOnly) {
globalLock = openLockFile(globalLockPath.c_str(), true); Path globalLockPath = dbDir + "/big-lock";
globalLock = openLockFile(globalLockPath.c_str(), true);
}
if (!lockFile(globalLock.get(), ltRead, false)) { if (!readOnly && !lockFile(globalLock.get(), ltRead, false)) {
printInfo("waiting for the big Nix store lock..."); printInfo("waiting for the big Nix store lock...");
lockFile(globalLock.get(), ltRead, true); lockFile(globalLock.get(), ltRead, true);
} }
@ -305,7 +307,7 @@ LocalStore::LocalStore(const Params & params)
"which is no longer supported. To convert to the new format,\n" "which is no longer supported. To convert to the new format,\n"
"please upgrade Nix to version 1.11 first."); "please upgrade Nix to version 1.11 first.");
if (!lockFile(globalLock.get(), ltWrite, false)) { if (!readOnly && !lockFile(globalLock.get(), ltWrite, false)) {
printInfo("waiting for exclusive access to the Nix store..."); printInfo("waiting for exclusive access to the Nix store...");
lockFile(globalLock.get(), ltNone, false); // We have acquired a shared lock; release it to prevent deadlocks lockFile(globalLock.get(), ltNone, false); // We have acquired a shared lock; release it to prevent deadlocks
lockFile(globalLock.get(), ltWrite, true); lockFile(globalLock.get(), ltWrite, true);
@ -340,7 +342,8 @@ LocalStore::LocalStore(const Params & params)
writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true); writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
lockFile(globalLock.get(), ltRead, true); if (!readOnly)
lockFile(globalLock.get(), ltRead, true);
} }
else openDB(*state, false); else openDB(*state, false);