Merge pull request #2459 from tedyu/linux-cont-set-cfg

Set configs back when intelrdt configs cannot be set LGTMS: @AkihiroSuda @kolyshkin
opencontainers · Jun 19, 2020 · dff7685 · dff7685
2 parents e643db6 + 9d275d3
commit dff7685
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -233,6 +233,9 @@ func (c *linuxContainer) Set(config configs.Config) error {
 	if c.intelRdtManager != nil {
 		if err := c.intelRdtManager.Set(&config); err != nil {
 			// Set configs back
+			if err2 := c.cgroupManager.Set(c.config); err2 != nil {
+				logrus.Warnf("Setting back cgroup configs failed due to error: %v, your state.json and actual configs might be inconsistent.", err2)
+			}
 			if err2 := c.intelRdtManager.Set(c.config); err2 != nil {
 				logrus.Warnf("Setting back intelrdt configs failed due to error: %v, your state.json and actual configs might be inconsistent.", err2)
 			}