Skip to content

Fix ETXTBSY flake in container-engine image tests #164

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
Ibrahimrahhal merged 1 commit into from
Aug 26, 2026
Merged

Fix ETXTBSY flake in container-engine image tests #164

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
44 changes: 33 additions & 11 deletions src/images.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,11 @@ mod tests {
use std::os::unix::fs::PermissionsExt;

let path = dir.join("stub-engine.sh");
let mut file = fs::File::create(&path).unwrap();
// Write to a sibling, fsync, chmod, then rename. Creating the
// executable in place and execing it immediately races overlayfs
// (GitHub Actions + llvm-cov) with ETXTBSY / "Text file busy".
let tmp = dir.join("stub-engine.sh.tmp");
let mut file = fs::File::create(&tmp).unwrap();
writeln!(
file,
r#"#!/bin/sh
Expand All @@ -396,15 +400,36 @@ exit 1
"#
)
.unwrap();
file.sync_all().unwrap();
drop(file);

let mut permissions = fs::metadata(&path).unwrap().permissions();
let mut permissions = fs::metadata(&tmp).unwrap().permissions();
permissions.set_mode(0o755);
fs::set_permissions(&path, permissions).unwrap();
fs::set_permissions(&tmp, permissions).unwrap();
fs::rename(&tmp, &path).unwrap();
wait_until_executable(&path);

path
}

/// Overlayfs can still return ETXTBSY on the first exec after rename.
/// Spin briefly so the tests do not flake under cargo-llvm-cov.
#[cfg(unix)]
fn wait_until_executable(path: &Path) {
for delay_ms in [0_u64, 2, 5, 10, 20, 50] {
if delay_ms > 0 {
std::thread::sleep(std::time::Duration::from_millis(delay_ms));
}
if Command::new(path)
.args(["image", "inspect", "warmup"])
.output()
.is_ok()
{
return;
}
}
}

#[cfg(unix)]
#[test]
fn save_images_writes_one_archive_per_image() {
Expand Down Expand Up @@ -501,13 +526,10 @@ exit 1
}

fn env_temp_dir(name: &str) -> PathBuf {
let dir = std::env::temp_dir().join(format!(
"corgea-images-test-{}-{}",
name,
std::process::id()
));
let _ = fs::remove_dir_all(&dir);
fs::create_dir_all(&dir).unwrap();
dir
tempfile::Builder::new()
.prefix(&format!("corgea-images-test-{name}-"))
.tempdir()
.expect("temp dir")
.keep()

@corgea-security corgea-security Aug 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: Unique temporary directories are never removed

Calling TempDir::keep() disables RAII cleanup. Unlike the previous stable per-process path, every helper invocation now leaves a uniquely named directory behind, causing persistent accumulation on developer machines. Return and retain the TempDir guard, or explicitly remove the directory after each test.

Proof or reproduction:

let dir = tempfile::Builder::new().tempdir().unwrap();
let path = dir.path().to_path_buf();
// Keep `dir` alive for the test; dropping it performs cleanup.

}
}
Loading