mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-29 09:06:15 +02:00
Add a test for auto-GC
This currently fails because we're using POSIX file locks. So when the garbage collector opens and closes its own temproots file, it causes the lock to be released and then deleted by another GC instance.
This commit is contained in:
parent
320126aeeb
commit
ec415d7166
4 changed files with 72 additions and 3 deletions
|
@ -871,7 +871,12 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
|
||||||
|
|
||||||
void LocalStore::autoGC(bool sync)
|
void LocalStore::autoGC(bool sync)
|
||||||
{
|
{
|
||||||
auto getAvail = [this]() {
|
static auto fakeFreeSpaceFile = getEnv("_NIX_TEST_FREE_SPACE_FILE", "");
|
||||||
|
|
||||||
|
auto getAvail = [this]() -> uint64_t {
|
||||||
|
if (!fakeFreeSpaceFile.empty())
|
||||||
|
return std::stoll(readFile(fakeFreeSpaceFile));
|
||||||
|
|
||||||
struct statvfs st;
|
struct statvfs st;
|
||||||
if (statvfs(realStoreDir.c_str(), &st))
|
if (statvfs(realStoreDir.c_str(), &st))
|
||||||
throw SysError("getting filesystem info about '%s'", realStoreDir);
|
throw SysError("getting filesystem info about '%s'", realStoreDir);
|
||||||
|
@ -892,7 +897,7 @@ void LocalStore::autoGC(bool sync)
|
||||||
|
|
||||||
auto now = std::chrono::steady_clock::now();
|
auto now = std::chrono::steady_clock::now();
|
||||||
|
|
||||||
if (now < state->lastGCCheck + std::chrono::seconds(5)) return;
|
if (now < state->lastGCCheck + std::chrono::seconds(settings.minFreeCheckInterval)) return;
|
||||||
|
|
||||||
auto avail = getAvail();
|
auto avail = getAvail();
|
||||||
|
|
||||||
|
|
|
@ -342,6 +342,9 @@ public:
|
||||||
Setting<uint64_t> maxFree{this, std::numeric_limits<uint64_t>::max(), "max-free",
|
Setting<uint64_t> maxFree{this, std::numeric_limits<uint64_t>::max(), "max-free",
|
||||||
"Stop deleting garbage when free disk space is above the specified amount."};
|
"Stop deleting garbage when free disk space is above the specified amount."};
|
||||||
|
|
||||||
|
Setting<uint64_t> minFreeCheckInterval{this, 5, "min-free-check-interval",
|
||||||
|
"Number of seconds between checking free disk space."};
|
||||||
|
|
||||||
Setting<Paths> pluginFiles{this, {}, "plugin-files",
|
Setting<Paths> pluginFiles{this, {}, "plugin-files",
|
||||||
"Plugins to dynamically load at nix initialization time."};
|
"Plugins to dynamically load at nix initialization time."};
|
||||||
};
|
};
|
||||||
|
|
59
tests/gc-auto.sh
Normal file
59
tests/gc-auto.sh
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
source common.sh
|
||||||
|
|
||||||
|
clearStore
|
||||||
|
|
||||||
|
garbage1=$(nix add-to-store --name garbage1 ./tarball.sh)
|
||||||
|
garbage2=$(nix add-to-store --name garbage2 ./tarball.sh)
|
||||||
|
garbage3=$(nix add-to-store --name garbage3 ./tarball.sh)
|
||||||
|
|
||||||
|
fake_free=$TEST_ROOT/fake-free
|
||||||
|
export _NIX_TEST_FREE_SPACE_FILE=$fake_free
|
||||||
|
echo 1100 > $fake_free
|
||||||
|
|
||||||
|
expr=$(cat <<EOF
|
||||||
|
with import ./config.nix; mkDerivation {
|
||||||
|
name = "gc-A";
|
||||||
|
buildCommand = ''
|
||||||
|
[[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 3 ]]
|
||||||
|
mkdir \$out
|
||||||
|
echo foo > \$out/bar
|
||||||
|
echo 1...
|
||||||
|
sleep 2
|
||||||
|
echo 100 > $fake_free
|
||||||
|
echo 2...
|
||||||
|
sleep 2
|
||||||
|
echo 3...
|
||||||
|
[[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 1 ]]
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
nix build -o $TEST_ROOT/result-A -L "($expr)" \
|
||||||
|
--min-free 1000 --max-free 2000 --min-free-check-interval 1 &
|
||||||
|
pid=$!
|
||||||
|
|
||||||
|
expr2=$(cat <<EOF
|
||||||
|
with import ./config.nix; mkDerivation {
|
||||||
|
name = "gc-B";
|
||||||
|
buildCommand = ''
|
||||||
|
mkdir \$out
|
||||||
|
echo foo > \$out/bar
|
||||||
|
echo 1...
|
||||||
|
sleep 2
|
||||||
|
echo 100 > $fake_free
|
||||||
|
echo 2...
|
||||||
|
sleep 2
|
||||||
|
echo 3...
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
nix build -o $TEST_ROOT/result-B -L "($expr2)" \
|
||||||
|
--min-free 1000 --max-free 2000 --min-free-check-interval 1
|
||||||
|
|
||||||
|
wait "$pid"
|
||||||
|
|
||||||
|
[[ foo = $(cat $TEST_ROOT/result-A/bar) ]]
|
||||||
|
[[ foo = $(cat $TEST_ROOT/result-B/bar) ]]
|
|
@ -3,7 +3,9 @@ check:
|
||||||
|
|
||||||
nix_tests = \
|
nix_tests = \
|
||||||
init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
|
init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
|
||||||
gc.sh gc-concurrent.sh \
|
gc.sh \
|
||||||
|
gc-concurrent.sh \
|
||||||
|
gc-auto.sh \
|
||||||
referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \
|
referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \
|
||||||
gc-runtime.sh check-refs.sh filter-source.sh \
|
gc-runtime.sh check-refs.sh filter-source.sh \
|
||||||
remote-store.sh export.sh export-graph.sh \
|
remote-store.sh export.sh export-graph.sh \
|
||||||
|
|
Loading…
Reference in a new issue