Merge pull request #2948 from baude/remotepause

podman-remote pause|unpause

1 files changed, 13 insertions, 41 deletions

diff --git a/cmd/podman/unpause.go b/cmd/podman/unpause.go
index 65e841b36..fa946bfd7 100644
--- a/cmd/podman/unpause.go
+++ b/cmd/podman/unpause.go
@@ -4,11 +4,9 @@ import (
 	"os"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
-	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -40,15 +38,11 @@ func init() {
 }
 
 func unpauseCmd(c *cliconfig.UnpauseValues) error {
-	var (
-		unpauseContainers []*libpod.Container
-		unpauseFuncs      []shared.ParallelWorkerInput
-	)
 	if os.Geteuid() != 0 {
 		return errors.New("unpause is not supported for rootless containers")
 	}
 
-	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
@@ -58,41 +52,19 @@ func unpauseCmd(c *cliconfig.UnpauseValues) error {
 	if len(args) < 1 && !c.All {
 		return errors.Errorf("you must provide at least one container name or id")
 	}
-	if c.All {
-		cs, err := getAllOrLatestContainers(&c.PodmanCommand, runtime, libpod.ContainerStatePaused, "paused")
-		if err != nil {
-			return err
-		}
-		unpauseContainers = append(unpauseContainers, cs...)
-	} else {
-		for _, arg := range args {
-			ctr, err := runtime.LookupContainer(arg)
-			if err != nil {
-				return err
+	ok, failures, err := runtime.UnpauseContainers(getContext(), c)
+	if err != nil {
+		if errors.Cause(err) == libpod.ErrNoSuchCtr {
+			if len(c.InputArgs) > 1 {
+				exitCode = 125
+			} else {
+				exitCode = 1
 			}
-			unpauseContainers = append(unpauseContainers, ctr)
-		}
-	}
-
-	// Assemble the unpause funcs
-	for _, ctr := range unpauseContainers {
-		con := ctr
-		f := func() error {
-			return con.Unpause()
 		}
-
-		unpauseFuncs = append(unpauseFuncs, shared.ParallelWorkerInput{
-			ContainerID:  con.ID(),
-			ParallelFunc: f,
-		})
+		return err
 	}
-
-	maxWorkers := shared.Parallelize("unpause")
-	if c.GlobalIsSet("max-workers") {
-		maxWorkers = c.GlobalFlags.MaxWorks
+	if len(failures) > 0 {
+		exitCode = 125
 	}
-	logrus.Debugf("Setting maximum workers to %d", maxWorkers)
-
-	unpauseErrors, errCount := shared.ParallelExecuteWorkerPool(maxWorkers, unpauseFuncs)
-	return printParallelOutput(unpauseErrors, errCount)
+	return printCmdResults(ok, failures)
 }