Make podman stats slirp check more robust

Just checking for `rootless.IsRootless()` does not catch all the cases where slirp4netns is in use - we actually allow it to be used as root as well. Fortify the conditional here so we don't fail in the root + slirp case. Fixes containers#7883 Signed-off-by: Matthew Heon <[email protected]>
mheon · Dec 8, 2020 · 46337b4 · 46337b4
1 parent 0cccba8
commit 46337b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
@@ -900,10 +900,9 @@ func (r *Runtime) reloadContainerNetwork(ctr *Container) ([]*cnitypes.Result, er
 
 func getContainerNetIO(ctr *Container) (*netlink.LinkStatistics, error) {
 	var netStats *netlink.LinkStatistics
-	// rootless v2 cannot seem to resolve its network connection to
-	// collect statistics.  For now, we allow stats to at least run
-	// by returning nil
-	if rootless.IsRootless() {
+	// With slirp4netns, we can't collect statistics at present.
+	// For now, we allow stats to at least run by returning nil
+	if rootless.IsRootless() || ctr.config.NetMode.IsSlirp4netns() {
 		return netStats, nil
 	}
 	netNSPath, netPathErr := getContainerNetNS(ctr)

diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go
@@ -128,6 +128,16 @@ var _ = Describe("Podman stats", func() {
 		Expect(session.ExitCode()).To(Equal(0))
 	})
 
+	It("podman stats on container with forced slirp4netns", func() {
+		// This will force the slirp4netns net mode to be tested as root
+		session := podmanTest.Podman([]string{"run", "-d", "--net", "slirp4netns", ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		session = podmanTest.Podman([]string{"stats", "--no-stream", "-a"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
+
 	// Regression test for #8265
 	It("podman stats with custom memory limits", func() {
 		// Run thre containers. One with a memory limit.  Make sure