opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-07 07:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

generate systemd: wrap pod/ctr lookup errors

Browse Source 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2020-06-10 11:05:41 +02:00
parent 139f82933d
commit 05713fbbf3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/domain/infra/abi/generate.go
View File

@ -16,8 +16,8 @@ import (
func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, options entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) { func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, options entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) {
// First assume it's a container. // First assume it's a container.
ctr, err := ic.Libpod.LookupContainer(nameOrID) ctr, ctrErr := ic.Libpod.LookupContainer(nameOrID)
if err == nil { if ctrErr == nil {
// Generate the unit for the container. // Generate the unit for the container.
s, err := generate.ContainerUnit(ctr, options) s, err := generate.ContainerUnit(ctr, options)
if err == nil { if err == nil {
@ -28,7 +28,8 @@ func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string,
// If it's not a container, we either have a pod or garbage. // If it's not a container, we either have a pod or garbage.
pod, err := ic.Libpod.LookupPod(nameOrID) pod, err := ic.Libpod.LookupPod(nameOrID)
if err != nil { if err != nil {
return nil, errors.Errorf("%q does not refer to a container or pod", nameOrID) err = errors.Wrap(ctrErr, err.Error())
return nil, errors.Wrapf(err, "%s does not refer to a container or pod", nameOrID)
} }
// Generate the units for the pod and all its containers. // Generate the units for the pod and all its containers.

2
pkg/systemd/generate/common.go
View File

@ -41,7 +41,7 @@ func filterPodFlags(command []string) []string {
for i := 0; i < len(command); i++ { for i := 0; i < len(command); i++ {
s := command[i] s := command[i]
if s == "--pod" || s == "--pod-id-file" { if s == "--pod" || s == "--pod-id-file" {
i += 1 i++
continue continue
} }
processed = append(processed, s) processed = append(processed, s)

4
pkg/systemd/generate/pods.go
View File

@ -99,7 +99,7 @@ func PodUnits(pod *libpod.Pod, options entities.GenerateSystemdOptions) (string,
// Error out if the pod has no infra container, which we require to be the // Error out if the pod has no infra container, which we require to be the
// main service. // main service.
if !pod.HasInfraContainer() { if !pod.HasInfraContainer() {
return "", fmt.Errorf("error generating systemd unit files: Pod %q has no infra container", pod.Name()) return "", errors.Errorf("error generating systemd unit files: Pod %q has no infra container", pod.Name())
} }
podInfo, err := generatePodInfo(pod, options) podInfo, err := generatePodInfo(pod, options)
@ -118,7 +118,7 @@ func PodUnits(pod *libpod.Pod, options entities.GenerateSystemdOptions) (string,
return "", err return "", err
} }
if len(containers) == 0 { if len(containers) == 0 {
return "", fmt.Errorf("error generating systemd unit files: Pod %q has no containers", pod.Name()) return "", errors.Errorf("error generating systemd unit files: Pod %q has no containers", pod.Name())
} }
graph, err := libpod.BuildContainerGraph(containers) graph, err := libpod.BuildContainerGraph(containers)
if err != nil { if err != nil {