Skip to content

Return errors instead of log.Fatal in storage/adapter.go #15

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
magic-peach wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

Return errors instead of log.Fatal in storage/adapter.go #15

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
14 changes: 7 additions & 7 deletions internal/runtime/storage/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (a *Adapter) Prepare(ctx context.Context, tc harnessruntime.TrialContext) (
// image
image, err := getOrPullImage(*a.ContainerdNamespace, a.ContainerdClient, tc.Trial.Image, tc.Trial.Snapshotter)
if err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("get or pull image %q: %w", tc.Trial.Image, err)
}
// create container metadata
container, err := a.ContainerdClient.NewContainer(
Expand All @@ -120,7 +120,7 @@ func (a *Adapter) Prepare(ctx context.Context, tc harnessruntime.TrialContext) (
),
)
if err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("create container %q: %w", tc.Trial.ID, err)
}

a.Container = container
Expand Down Expand Up @@ -165,13 +165,13 @@ func (a *Adapter) CreateTask(ctx context.Context, tc harnessruntime.TrialContext
cio.WithStreams(nil, &a.StdoutBuffer, &a.StderrBuffer),
))
if err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("create task %q: %w", tc.Trial.ID, err)
}
a.Task = task

exitCh, err := task.Wait(*a.ContainerdNamespace)
if err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("wait on task %q: %w", tc.Trial.ID, err)
}

a.TaskExitCh = exitCh
Expand Down Expand Up @@ -213,7 +213,7 @@ func (a *Adapter) StartTask(ctx context.Context, tc harnessruntime.TrialContext)
startedAt := time.Now()

if err := a.Task.Start(*a.ContainerdNamespace); err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("start task %q: %w", tc.Trial.ID, err)
}

finishedAt := time.Now()
Expand All @@ -227,7 +227,7 @@ func (a *Adapter) StartTask(ctx context.Context, tc harnessruntime.TrialContext)
case status := <-a.TaskExitCh:
exitCodee, _, err := status.Result()
if err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("read task exit status: %w", err)
}

exitCode = exitCodee
Expand Down Expand Up @@ -286,7 +286,7 @@ func (a *Adapter) DeleteTask(ctx context.Context, tc harnessruntime.TrialContext
startedAt := time.Now()

if _, err := a.Task.Delete(*a.ContainerdNamespace); err != nil {
log.Fatal(err)
return harnessruntime.StageResult{}, fmt.Errorf("delete task %q: %w", tc.Trial.ID, err)
}

finishedAt := time.Now()
Expand Down
Loading