Skip to content

fix(run): isolate containerd from service to prevent boltdb lock #79

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
luthermonson merged 2 commits into from
May 25, 2026
Merged

fix(run): isolate containerd from service to prevent boltdb lock #79

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
05d8b48
fix(run): use isolated temp directory and socket to avoid conflict wi…
luthermonson May 25, 2026
d9ca513
fix(run): handle os.RemoveAll error properly
luthermonson May 25, 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
26 changes: 24 additions & 2 deletions cmd/ephemerd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,31 @@ func runWorkflow(ctx context.Context, workflowPath string, jobFilter string) err
return nil
}

// Use an isolated temp directory so the run command doesn't conflict with
// the ephemerd service (BoltDB is single-writer and they'd share the same
// data directory and named pipe otherwise).
tmpDir, err := os.MkdirTemp("", "ephemerd-run-*")
if err != nil {
return fmt.Errorf("creating temp directory: %w", err)
}
defer func() {
if err := os.RemoveAll(tmpDir); err != nil {
log.Warn("failed to clean up temp directory", "dir", tmpDir, "error", err)
}
}()

// On Windows, derive a unique named pipe so we don't collide with the
// service's \\.\pipe\ephemerd-containerd. On Unix the socket lives
// inside DataDir which is already unique.
var socketPath string
if runtime.GOOS == "windows" {
socketPath = `\\.\pipe\ephemerd-run-` + filepath.Base(tmpDir)
}

runner := &workflow.Runner{
DataDir: configDir,
Log: log,
DataDir: tmpDir,
SocketPath: socketPath,
Log: log,
}

return runner.RunJob(ctx, jobName, job, repoDir)
Expand Down
10 changes: 6 additions & 4 deletions pkg/workflow/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ const (

// Runner executes workflow jobs locally using embedded containerd.
type Runner struct {
DataDir string
Log *slog.Logger
DataDir string
SocketPath string // optional: containerd socket override for isolation from the service
Log *slog.Logger
}

// gitInfo holds repository metadata sniffed from the local git repo.
Expand All @@ -48,8 +49,9 @@ func (r *Runner) RunJob(ctx context.Context, jobName string, job Job, repoDir st
// Start embedded containerd
r.Log.Info("starting containerd")
ctrd, err := ctdpkg.New(ctdpkg.Config{
DataDir: r.DataDir,
Log: r.Log,
DataDir: r.DataDir,
SocketPath: r.SocketPath,
Log: r.Log,
})
if err != nil {
return fmt.Errorf("starting containerd: %w", err)
Expand Down