picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't rely on st_blocks 

It doesn't seem very reliable on ZFS.
This commit is contained in:
Eelco Dolstra 2019-08-29 14:49:58 +02:00
parent 31f5ecfaa5
commit a2c4fcd5e9
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstore/gc.cc
View File

@ -690,9 +690,8 @@ void LocalStore::removeUnusedLinks(const GCState & state)
throw SysError(format("statting '%1%'") % path); throw SysError(format("statting '%1%'") % path);
if (st.st_nlink != 1) { if (st.st_nlink != 1) {
unsigned long long size = st.st_blocks * 512ULL; actualSize += st.st_size;
actualSize += size; unsharedSize += (st.st_nlink - 1) * st.st_size;
unsharedSize += (st.st_nlink - 1) * size;
continue; continue;
} }
@ -701,7 +700,7 @@ void LocalStore::removeUnusedLinks(const GCState & state)
if (unlink(path.c_str()) == -1) if (unlink(path.c_str()) == -1)
throw SysError(format("deleting '%1%'") % path); throw SysError(format("deleting '%1%'") % path);
state.results.bytesFreed += st.st_blocks * 512ULL; state.results.bytesFreed += st.st_size;
} }
struct stat st; struct stat st;

2
src/libutil/util.cc
View File

@ -397,7 +397,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
} }
if (!S_ISDIR(st.st_mode) && st.st_nlink == 1) if (!S_ISDIR(st.st_mode) && st.st_nlink == 1)
bytesFreed += st.st_blocks * 512; bytesFreed += st.st_size;
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
/* Make the directory accessible. */ /* Make the directory accessible. */

4
tests/gc-auto.sh
View File

@ -22,7 +22,7 @@ with import ./config.nix; mkDerivation {
echo foo > \$out/bar echo foo > \$out/bar
echo 1... echo 1...
sleep 2 sleep 2
echo 100 > $fake_free echo 200 > $fake_free
echo 2... echo 2...
sleep 2 sleep 2
echo 3... echo 3...
@ -44,7 +44,7 @@ with import ./config.nix; mkDerivation {
echo foo > \$out/bar echo foo > \$out/bar
echo 1... echo 1...
sleep 2 sleep 2
echo 100 > $fake_free echo 200 > $fake_free
echo 2... echo 2...
sleep 2 sleep 2
echo 3... echo 3...