Merge remote-tracking branch 'upstream/master' into overlayfs-store

tests/functional/local-overlay-store/verify-inner.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+set -x
+
+source common.sh
+
+# Avoid store dir being inside sandbox build-dir
+unset NIX_STORE_DIR
+unset NIX_STATE_DIR
+
+storeDirs
+
+initLowerStore
+
+mountOverlayfs
+
+
+## Initialise stores for test
+
+# Realise a derivation from the lower store to propagate paths to overlay DB
+nix-store --store "$storeB" --realise $drvPath
+
+# Also ensure dummy file exists in overlay DB
+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
+nix-store --store "$storeB" --verify --check-contents
+
+# 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")
+inputDrvPath=${inputDrvFullPath/*\/nix\/store\///nix/store/}
+rm -v "$inputDrvFullPath"
+
+# Truncate the contents of dummy file in lower store
+find "$storeA" -name "*-dummy" -exec truncate -s 0 {} \;
+
+# Also truncate the file that only exists in lower store
+truncate -s 0 "$storeA/$lowerOnlyPath"
+
+# Ensure overlayfs is synchronised
+remountOverlayfs
+
+
+## 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 '$dummyPath' was modified! expected hash"
+<<<"$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'"