Skip to content

ateom: remove the ateom directory on graceful shutdown #1678

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
Jeff Luo (JeffLuoo) merged 3 commits into from
Sep 19, 2026
Merged

ateom: remove the ateom directory on graceful shutdown #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4dfa1
ateom: remove the ateom directory on graceful shutdown
baizhenyu Sep 16, 2026
e935a49
ateom: validate --pod-uid before the directory it names is removable
baizhenyu Sep 17, 2026
6f6d21e
ateom-gvisor: return the Serve error instead of exiting
baizhenyu Sep 18, 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
12 changes: 10 additions & 2 deletions cmd/ateom-gvisor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,18 @@ func do(ctx context.Context) error {

// Create ateom dir
ateomDir := ateompath.AteomPath(*podUID)
if err := resources.ValidateAteomUID(*podUID); err != nil {
return fmt.Errorf("in resources.ValidateAteomUID: %w", err)
}
if err := os.MkdirAll(ateomDir, 0o700); err != nil {
return fmt.Errorf("in os.MkdirAll(%q): %w", ateomDir, err)
}
Comment thread
baizhenyu marked this conversation as resolved.
// Clean up the ateom directory during graceful shutdown (#1677).
defer func() {
if err := os.RemoveAll(ateomDir); err != nil {
slog.ErrorContext(ctx, "Failed to remove the ateom directory on shutdown", slog.Any("err", err))
}
}()
Comment thread
BenTheElder marked this conversation as resolved.

// Prepare the pod cgroup so runsc can create per-actor-container leaves under
// it with real accounting.
Expand Down Expand Up @@ -259,8 +268,7 @@ func do(ctx context.Context) error {
go serverboot.StartReadinessServer(ctx, *readinessListenAddress, readiness)

if err := svr.Serve(lis); err != nil {
slog.ErrorContext(ctx, "Failed to serve", slog.Any("err", err))
os.Exit(1)
return fmt.Errorf("while serving: %w", err)
}

return nil
Expand Down
9 changes: 9 additions & 0 deletions cmd/ateom-microvm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,18 @@ func do(ctx context.Context) error {

// Create ateom dir.
ateomDir := ateompath.AteomPath(*podUID)
if err := resources.ValidateAteomUID(*podUID); err != nil {
return fmt.Errorf("in resources.ValidateAteomUID: %w", err)
}
if err := os.MkdirAll(ateomDir, 0o700); err != nil {
return fmt.Errorf("in os.MkdirAll(%q): %w", ateomDir, err)
}
// Clean up the ateom directory during graceful shutdown (#1677).
defer func() {
if err := os.RemoveAll(ateomDir); err != nil {
slog.ErrorContext(ctx, "Failed to remove the ateom directory on shutdown", slog.Any("err", err))
}
}()

// Reap children reparented to us: the detached cloud-hypervisor VMM and
// virtiofsd. Synchronous subprocesses (mount, umount, cp, ...) instead go
Expand Down
Loading