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

Merge branch 'overlayfs-store' of github.com:NixLayeredStore/nix into overlayfs-store

Browse source
This commit is contained in:
John Ericson 2023-07-25 09:54:50 -04:00
commit 272cfd6aed
4 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/local-overlay-store.cc
View file

@ -209,13 +209,6 @@ void LocalOverlayStore::optimiseStore()
} }
} }
bool LocalOverlayStore::verifyStore(bool checkContents, RepairFlag repair)
{
if (repair)
warn("local-overlay: store does not support --verify --repair");
return LocalStore::verifyStore(checkContents, NoRepair);
}
static RegisterStoreImplementation<LocalOverlayStore, LocalOverlayStoreConfig> regLocalOverlayStore; static RegisterStoreImplementation<LocalOverlayStore, LocalOverlayStoreConfig> regLocalOverlayStore;
} }

2
src/libstore/local-overlay-store.hh
View file

@ -114,8 +114,6 @@ private:
void deleteGCPath(const Path & path, uint64_t & bytesFreed) override; void deleteGCPath(const Path & path, uint64_t & bytesFreed) override;
void optimiseStore() override; void optimiseStore() override;
bool verifyStore(bool checkContents, RepairFlag repair) override;
}; };
} }

8
tests/overlay-local-store/common.sh
View file

@ -7,9 +7,13 @@ requireEnvironment () {
needLocalStore "The test uses --store always so we would just be bypassing the daemon" needLocalStore "The test uses --store always so we would just be bypassing the daemon"
} }
addConfig () {
echo "$1" >> "$NIX_CONF_DIR/nix.conf"
}
setupConfig () { setupConfig () {
echo "require-drop-supplementary-groups = false" >> "$NIX_CONF_DIR"/nix.conf addConfig "require-drop-supplementary-groups = false"
echo "build-users-group = " >> "$NIX_CONF_DIR"/nix.conf addConfig "build-users-group = "
} }

36
tests/overlay-local-store/verify-inner.sh
View file

@ -16,25 +16,51 @@ initLowerStore
mountOverlayfs mountOverlayfs
## Initialise stores for test
# Realise a derivation from the lower store to propagate paths to overlay DB # Realise a derivation from the lower store to propagate paths to overlay DB
nix-store --store "$storeB" --realise $drvPath nix-store --store "$storeB" --realise $drvPath
# Also ensure dummy file exists in overlay DB # Also ensure dummy file exists in overlay DB
dummyPath=$(nix-store --store "$storeB" --add ../dummy) dummyPath=$(nix-store --store "$storeB" --add ../dummy)
# Add something to the lower store that will not be propagated to overlay DB
lowerOnlyPath=$(addTextToStore "$storeA" lower-only "Only in lower store")
# Verify should be successful at this point # Verify should be successful at this point
nix-store --store "$storeB" --verify --check-contents nix-store --store "$storeB" --verify --check-contents
# Now delete one of the derivation inputs in the lower store # Make a backup so we can repair later
backupStore="$storeVolume/backup"
mkdir "$backupStore"
tar -cC "$storeBRoot" nix | tar -xC "$backupStore"
## Deliberately corrupt store paths
# Delete one of the derivation inputs in the lower store
inputDrvFullPath=$(find "$storeA" -name "*-hermetic-input-1.drv") inputDrvFullPath=$(find "$storeA" -name "*-hermetic-input-1.drv")
inputDrvPath=${inputDrvFullPath/*\/nix\/store\///nix/store/} inputDrvPath=${inputDrvFullPath/*\/nix\/store\///nix/store/}
rm -v "$inputDrvFullPath" rm -v "$inputDrvFullPath"
# And truncate the contents of dummy file in lower store # Truncate the contents of dummy file in lower store
find "$storeA" -name "*-dummy" -exec truncate -s 0 {} \; find "$storeA" -name "*-dummy" -exec truncate -s 0 {} \;
# Verify should fail with the messages about missing input and modified dummy file # Also truncate the file that only exists in lower store
verifyOutput=$(expectStderr 1 nix-store --store "$storeB" --verify --check-contents --repair) truncate -s 0 "$storeA/$lowerOnlyPath"
## Now test that verify and repair work as expected
# Verify overlay store without attempting to repair it
verifyOutput=$(expectStderr 1 nix-store --store "$storeB" --verify --check-contents)
<<<"$verifyOutput" grepQuiet "path '$inputDrvPath' disappeared, but it still has valid referrers!" <<<"$verifyOutput" grepQuiet "path '$inputDrvPath' disappeared, but it still has valid referrers!"
<<<"$verifyOutput" grepQuiet "path '$dummyPath' was modified! expected hash" <<<"$verifyOutput" grepQuiet "path '$dummyPath' was modified! expected hash"
<<<"$verifyOutput" grepQuiet "store does not support --verify --repair" <<<"$verifyOutput" expectStderr 1 grepQuiet "$lowerOnlyPath" # Expect no error for corrupted lower-only path
# Attempt to repair using backup
addConfig "substituters = $backupStore"
repairOutput=$(nix-store --store "$storeB" --verify --check-contents --repair 2>&1)
<<<"$repairOutput" grepQuiet "copying path '$inputDrvPath'"
<<<"$repairOutput" grepQuiet "copying path '$dummyPath'"