Skip to content

post: run the fstrim timeout under sudo so it can stop fstrim #149

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

Open
magma-beef wants to merge 1 commit into
base: main
Choose a base branch
from
Open

post: run the fstrim timeout under sudo so it can stop fstrim #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dist/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const execAsync = promisify(exec);
// Best-effort fstrim of the sticky disk before it is unmounted and committed:
// pruned layers keep their RBD extents allocated on the backing store until
// the guest discards them. Bounded by the host-supplied budget; any failure
// (discard not negotiated, missing binary, timeout) only logs. A positive
// (discard not negotiated, missing binary, timeout) only logs. `timeout` runs
// under sudo so it has the privilege to stop root's fstrim. A positive
// minExtentBytes is passed as `fstrim -m`: free extents smaller than that are
// left alone.
async function trimFilesystem(
Expand All @@ -57,7 +58,7 @@ async function trimFilesystem(
const minimum = minExtentBytes > 0 ? ` -m ${minExtentBytes}` : "";
try {
const { stdout } = await execAsync(
`timeout ${timeoutSecs} sudo fstrim -v${minimum} -- "${mountPath}"`,
`sudo timeout ${timeoutSecs} fstrim -v${minimum} -- "${mountPath}"`,
);
core.info(
`fstrim ${mountPath}: ${stdout.trim() || "done"} in ${Date.now() - start}ms`,
Expand Down
2 changes: 1 addition & 1 deletion src/setup_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export async function startBuildkitd(
export type FstrimFailureOutcome = "timeout" | "unsupported" | "failed";

/**
* Classifies a failed `timeout <n> sudo fstrim` run: 124 is timeout(1)'s
* Classifies a failed `sudo timeout <n> fstrim` run: 124 is timeout(1)'s
* exit code; discard not negotiated by the hypervisor (EOPNOTSUPP) or no
* fstrim binary are "unsupported"; anything else is "failed".
*/
Expand Down
Loading