Skip to content

fix(server): storage cleanup no longer counts hardlinked files as recovered space #17910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 2 commits into from
Oct 19, 2026
Merged

fix(server): storage cleanup no longer counts hardlinked files as recovered space #17910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
882ab6b
fix(server): storage cleanup no longer counts hardlinked files as rec…
tris203 Oct 10, 2026
f25cde7
fix(server): measure recoverable worktree blocks on current main
juliusmarminge Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 70 additions & 13 deletions apps/server/src/storageCleanup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as Deferred from "effect/Deferred";
import * as Fiber from "effect/Fiber";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import type * as Path from "effect/Path";
import type * as Scope from "effect/Scope";
import * as Stream from "effect/Stream";
Expand Down Expand Up @@ -236,6 +237,16 @@ describe("merged pull request cleanup", () => {
});
});

const allocatedBytes = (fs: FileSystem.FileSystem, file: string) =>
fs.stat(file).pipe(
Effect.map((stat) =>
Option.getOrElse(
Option.map(stat.blocks, (blocks) => Number(blocks) * 512),
() => Number(stat.size),
),
),
);

const cleanupFixture = (
storageCleanup: StorageCleanupSettings = {
...DEFAULT_SERVER_SETTINGS.storageCleanup,
Expand Down Expand Up @@ -811,6 +822,7 @@ describe("orphan worktree reports", () => {
orphan = `${fixture.config.worktreesDir}/repository/orphan`;
yield* fs.makeDirectory(orphan, { recursive: true });
yield* fs.writeFileString(`${orphan}/file`, "x");
const bytes = yield* allocatedBytes(fs, `${orphan}/file`);
yield* fs.utimes(orphan, 1, 1);
const later = `${fixture.config.worktreesDir}/repository/z-later`;
yield* fs.makeDirectory(later);
Expand All @@ -829,18 +841,20 @@ describe("orphan worktree reports", () => {
expect(orphanEntry(firstReport)?.bytes).toBeNull();
expect(firstReport.entries.find((entry) => entry.path === later)?.bytes).toBeNull();
const nextReport = yield* fixture.service.runNow;
expect(orphanEntry(nextReport)?.bytes).toBe(limit === "walk-timeout" ? null : 1);
expect(orphanEntry(nextReport)?.bytes).toBe(limit === "walk-timeout" ? null : bytes);
expect(nextReport.entries.find((entry) => entry.path === later)?.bytes).toBe(0);
yield* fs.writeFileString(`${orphan}/file`, "changed");
yield* fs.writeFileString(`${orphan}/file`, "changed".repeat(10_000));
const changedBytes = yield* allocatedBytes(fs, `${orphan}/file`);
expect(changedBytes).not.toBe(bytes);
expect(orphanEntry(yield* fixture.service.runNow)?.bytes).toBe(
limit === "walk-timeout" ? null : 1,
limit === "walk-timeout" ? null : bytes,
);
expect(walks).toBe(limit === "walk-timeout" ? 1 : 2);
if (limit === "walk-timeout") return;
fixture.setStoredWorktreePaths([orphan]);
expect(orphanEntry(yield* fixture.service.runNow)).toBeUndefined();
fixture.setStoredWorktreePaths([]);
expect(orphanEntry(yield* fixture.service.runNow)?.bytes).toBe(7);
expect(orphanEntry(yield* fixture.service.runNow)?.bytes).toBe(changedBytes);
expect(walks).toBe(3);
}),
),
Expand All @@ -856,7 +870,7 @@ describe("orphan worktree reports", () => {
const orphan = `${fixture.config.worktreesDir}/${location === "nested" ? "repository/" : ""}orphan`;
yield* fixture.command(fixture.repo, ["worktree", "add", "-b", "orphan", orphan]);
const sizes = yield* Effect.forEach(yield* fixture.fs.readDirectory(orphan), (name) =>
fixture.fs.stat(`${orphan}/${name}`).pipe(Effect.map((stat) => Number(stat.size))),
allocatedBytes(fixture.fs, `${orphan}/${name}`),
);
const outside = yield* fixture.fs.makeTempDirectoryScoped();
yield* fixture.fs.writeFileString(`${outside}/external`, "outside data");
Expand Down Expand Up @@ -1047,7 +1061,11 @@ describe("orphan worktree reports", () => {
yield* fixture.fs.utimes(orphan, 1, 1);
const report = yield* fixture.service.runNow;
expect(report.entries).toEqual([
expect.objectContaining({ path: orphan, outcome: "kept", bytes: 1 }),
expect.objectContaining({
path: orphan,
outcome: "kept",
bytes: yield* allocatedBytes(fixture.fs, `${orphan}/file`),
}),
]);
expect(yield* fixture.fs.exists(`${project}/src/nested`)).toBe(true);
expect(yield* fixture.fs.exists(orphan)).toBe(true);
Expand Down Expand Up @@ -1091,7 +1109,7 @@ describe("orphan worktree reports", () => {
expect.objectContaining({
path: folder,
outcome: "kept",
bytes: 13,
bytes: yield* allocatedBytes(fixture.fs, `${folder}/payload`),
reason: "No thread uses this folder, and it isn't a git worktree",
}),
]);
Expand Down Expand Up @@ -1119,7 +1137,11 @@ describe("orphan worktree reports", () => {
Effect.ensuring(fixture.fs.chmod(blocked, 0o700).pipe(Effect.orDie)),
);
expect(report.entries).toEqual([
expect.objectContaining({ path: orphan, outcome: "kept", bytes: 1 }),
expect.objectContaining({
path: orphan,
outcome: "kept",
bytes: yield* allocatedBytes(fixture.fs, `${orphan}/file`),
}),
]);
expect(yield* fixture.fs.exists(orphan)).toBe(true);
}),
Expand Down Expand Up @@ -1166,7 +1188,11 @@ describe("orphan worktree reports", () => {
}
const report = yield* fixture.service.runNow;
expect(report.entries).toHaveLength(200);
expect(report.entries.every((entry) => entry.bytes === 1)).toBe(true);
const bytes = yield* allocatedBytes(
fixture.fs,
`${fixture.config.worktreesDir}/repository/orphan-0/file`,
);
expect(report.entries.every((entry) => entry.bytes === bytes)).toBe(true);
expect(report.omittedCount).toBe(5);
expect(report.counts).toEqual({ removed: 0, kept: 205, failed: 0 });
expect(report.bytesFreed).toBe(0);
Expand Down Expand Up @@ -1202,26 +1228,57 @@ describe("storage cleanup reports and local file policies", () => {
),
);

it.live("measures nested regular files without following symlinks", () =>
it.live("reports allocated bytes of single-link files without following symlinks", () =>
runCleanupTest(
Effect.gen(function* () {
const { service, fs, worktree, setPolicy } = yield* cleanupFixture();
setPolicy("tracked-changes");
const sizes = yield* Effect.forEach(yield* fs.readDirectory(worktree), (name) =>
fs.stat(`${worktree}/${name}`).pipe(Effect.map((stat) => Number(stat.size))),
allocatedBytes(fs, `${worktree}/${name}`),
);
const outside = yield* fs.makeTempDirectoryScoped();
yield* fs.writeFileString(`${outside}/external`, "must not count");
yield* fs.writeFileString(`${outside}/store-file`, "shared ".repeat(10_000));
yield* fs.makeDirectory(`${worktree}/node_modules/nested`, { recursive: true });
yield* fs.writeFileString(`${worktree}/node_modules/nested/file`, "count me");
sizes.push(yield* allocatedBytes(fs, `${worktree}/node_modules/nested/file`));
yield* fs.link(`${outside}/store-file`, `${worktree}/node_modules/hardlinked`);
yield* fs.symlink(outside, `${worktree}/node_modules/directory-link`);
yield* fs.symlink(`${outside}/external`, `${worktree}/node_modules/file-link`);
yield* fs.symlink(`${outside}/missing`, `${worktree}/node_modules/dangling-link`);
const report = yield* service.runNow;
const bytes = sizes.reduce((sum, size) => sum + size, 8);
const bytes = sizes.reduce((sum, size) => sum + size, 0);
expect(report.entries[0]).toMatchObject({ outcome: "removed", bytes, files: null });
expect(report.bytesFreed).toBe(bytes);
expect(yield* fs.readFileString(`${outside}/external`)).toBe("must not count");
expect(yield* fs.readFileString(`${outside}/store-file`)).toBe("shared ".repeat(10_000));
expect(yield* fs.exists(worktree)).toBe(false);
}),
),
);
it.live("falls back to file lengths when link counts and allocated blocks are unavailable", () =>
runCleanupTest(
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const { service, worktree } = yield* cleanupFixture().pipe(
Effect.provideService(FileSystem.FileSystem, {
...fs,
stat: (path) =>
fs
.stat(path)
.pipe(
Effect.map((stat) => ({ ...stat, nlink: Option.none(), blocks: Option.none() })),
),
}),
);
const sizes = yield* Effect.forEach(yield* fs.readDirectory(worktree), (name) =>
fs.stat(`${worktree}/${name}`).pipe(Effect.map((stat) => Number(stat.size))),
);
const bytes = sizes.reduce((sum, size) => sum + size, 0);
const report = yield* service.runNow;
expect(report.entries[0]).toMatchObject({ outcome: "removed", bytes });
expect(report.bytesFreed).toBe(bytes);
expect(yield* fs.exists(worktree)).toBe(false);
}),
),
);
Expand Down Expand Up @@ -1425,7 +1482,7 @@ describe("storage cleanup reports and local file policies", () => {
expect(yield* service.latestReport).toBeNull();
yield* fs.writeFileString(`${worktree}/${file}`, "local data\n");
const sizes = yield* Effect.forEach(yield* fs.readDirectory(worktree), (name) =>
fs.stat(`${worktree}/${name}`).pipe(Effect.map((stat) => Number(stat.size))),
allocatedBytes(fs, `${worktree}/${name}`),
);
const bytes = sizes.reduce((sum, size) => sum + size, 0);
const report = yield* service.runNow;
Expand Down
10 changes: 8 additions & 2 deletions apps/server/src/storageCleanup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,14 @@ const make = Effect.gen(function* () {
if (isLink) continue;
if ((yield* fs.realPath(target)) !== target) return null;
const stat = yield* fs.stat(target);
if (stat.type === "File") bytes += Number(stat.size);
else if (stat.type === "Directory") {
if (stat.type === "File") {
// Removing a shared hardlink leaves its blocks allocated.
if (Option.getOrElse(stat.nlink, () => 1n) !== 1n) continue;
Comment thread
juliusmarminge marked this conversation as resolved.
bytes += Option.match(stat.blocks, {
onNone: () => Number(stat.size),
onSome: (blocks) => Number(blocks * 512n),
});
} else if (stat.type === "Directory") {
const names = yield* fs.readDirectory(target);
entries += names.length;
if (entries > 2_000_000) return null;
Expand Down
Loading