libct/cg/sd/v2: call initPath from Path

kolyshkin · kolyshkin · commit 4f8ccc5ff582 · 2021-05-07T22:05:56.000-07:00
Sometimes Path() is called before m.path is initialized (in particular, this happens from (*linuxContainer).newInitConfig), so we do need to make sure to call initPath. This fixes the following integration tests (for cgroup v2 + systemd case, currently not enabled -- to be enabled by further commits): * runc run (blkio weight) * runc run (cgroupv2 mount inside container) Fixes: ff692f2 ("Fix cgroup2 mount for rootless case") Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
diff --git a/libcontainer/cgroups/systemd/v2.go b/libcontainer/cgroups/systemd/v2.go
@@ -317,6 +317,7 @@ func (m *unifiedManager) Destroy() error {
 }
 
 func (m *unifiedManager) Path(_ string) string {
+	_ = m.initPath()
 	return m.path
 }
 

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,7 @@ func (m *unifiedManager) Destroy() error {`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`func (m *unifiedManager) Path(_ string) string {`
	`320`	`+ _ = m.initPath()`
`320`	`321`	`return m.path`
`321`	`322`	`}`
`322`	`323`