From f7c3cfde77a4bc8b241fb36c4d39cbe2fde0c45c Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Tue, 5 May 2020 16:19:30 -0400
Subject: Add small fixes for 'podman run' from diffing inspect

To try and identify differences between Podman v1.9 and master,
I ran a series of `podman run` commands with various flags
through each, then inspecting the resulting containers and diffed
the inspect JSON between each. This identified a number of issues
which are fixed in this PR.

In order of discovery:
- Podman v2 gave short names for images, where Podman v1 gave the
  fully-qualified name. Simple enough fix (get image tags and use
  the first one if they're available)
- The --restart flag was not being parsed correctly when a number
  of retries was specified. Parsing has been corrected.
- The -m flag was not setting the swap limit (simple fix to set
  swap in that case if it's not explicitly set by the user)
- The --cpus flag was completely nonfunctional (wired in its
  logic)

Tests have been added for all of these to catch future
regressions.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 cmd/podman/common/specgen.go | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'cmd/podman/common')

diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 7467c184a..3681804ea 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -26,6 +26,16 @@ func getCPULimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string)
 	cpu := &specs.LinuxCPU{}
 	hasLimits := false
 
+	const cpuPeriod = 100000
+
+	if c.CPUS > 0 {
+		quota := int64(c.CPUS * cpuPeriod)
+		period := uint64(cpuPeriod)
+
+		cpu.Period = &period
+		cpu.Quota = &quota
+		hasLimits = true
+	}
 	if c.CPUShares > 0 {
 		cpu.Shares = &c.CPUShares
 		hasLimits = true
@@ -142,6 +152,10 @@ func getMemoryLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []strin
 			return nil, errors.Wrapf(err, "invalid value for memory")
 		}
 		memory.Limit = &ml
+		if c.MemorySwap == "" {
+			limit := 2 * ml
+			memory.Swap = &(limit)
+		}
 		hasLimits = true
 	}
 	if m := c.MemoryReservation; len(m) > 0 {
@@ -606,7 +620,29 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
 	s.Name = c.Name
 
 	s.OOMScoreAdj = &c.OOMScoreAdj
-	s.RestartPolicy = c.Restart
+	if c.Restart != "" {
+		splitRestart := strings.Split(c.Restart, ":")
+		switch len(splitRestart) {
+		case 1:
+			// No retries specified
+		case 2:
+			if strings.ToLower(splitRestart[0]) != "on-failure" {
+				return errors.Errorf("restart policy retries can only be specified with on-failure restart policy")
+			}
+			retries, err := strconv.Atoi(splitRestart[1])
+			if err != nil {
+				return errors.Wrapf(err, "error parsing restart policy retry count")
+			}
+			if retries < 0 {
+				return errors.Errorf("must specify restart policy retry count as a number greater than 0")
+			}
+			var retriesUint uint = uint(retries)
+			s.RestartRetries = &retriesUint
+		default:
+			return errors.Errorf("invalid restart policy: may specify retries at most once")
+		}
+		s.RestartPolicy = splitRestart[0]
+	}
 	s.Remove = c.Rm
 	s.StopTimeout = &c.StopTimeout
 
-- 
cgit v1.2.3-54-g00ecf