Merge pull request #4458 from haircommander/collect-mode-1.17

openshift-merge-robot · web-flow · commit 88b1d36459e2 · 2021-03-05T10:57:04.000-05:00
[1.17] set inactive-or-failed CollectMode if appropriate
diff --git a/internal/config/node/node.go b/internal/config/node/node.go
@@ -0,0 +1,45 @@
+// +build linux
+
+package node
+
+import (
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+// ValidateConfig initializes and validates all of the singleton variables
+// that store the node's configuration.
+// Currently, we check hugetlb, cgroup v1 or v2, pid and memory swap support for cgroups.
+// We check the error at server configuration validation, and if we error, shutdown
+// cri-o early, instead of when we're already trying to run containers.
+func ValidateConfig() error {
+	toInit := []struct {
+		name      string
+		init      func() bool
+		err       *error
+		activated *bool
+		fatal     bool
+	}{
+		{
+			name:      "systemd CollectMode",
+			init:      SystemdHasCollectMode,
+			err:       &systemdHasCollectModeErr,
+			activated: &systemdHasCollectMode,
+			fatal:     false,
+		},
+	}
+	for _, i := range toInit {
+		i.init()
+		if *i.err != nil {
+			err := errors.Errorf("node configuration validation for %s failed: %v", i.name, *i.err)
+			if i.fatal {
+				return err
+			}
+			logrus.Error(err.Error())
+		}
+		if i.activated != nil {
+			logrus.Infof("node configuration value for %s is %v", i.name, *i.activated)
+		}
+	}
+	return nil
+}
diff --git a/internal/config/node/systemd.go b/internal/config/node/systemd.go
@@ -0,0 +1,44 @@
+// +build linux
+
+package node
+
+import (
+	"os/exec"
+	"regexp"
+	"strconv"
+	"sync"
+
+	"github.com/pkg/errors"
+)
+
+var (
+	systemdHasCollectModeOnce sync.Once
+	systemdHasCollectMode     bool
+	systemdHasCollectModeErr  error
+)
+
+func SystemdHasCollectMode() bool {
+	systemdHasCollectModeOnce.Do(func() {
+		stdout, err := exec.Command("systemctl", "--version").Output()
+		if err != nil {
+			systemdHasCollectModeErr = err
+			return
+		}
+		matches := regexp.MustCompile(`^systemd (?P<Version>\d+)`).FindStringSubmatch(string(stdout))
+
+		if len(matches) != 2 {
+			systemdHasCollectModeErr = errors.Errorf("systemd version command returned incompatible formatted information: %v", string(stdout))
+			return
+		}
+
+		systemdVersion, err := strconv.Atoi(matches[1])
+		if err != nil {
+			systemdHasCollectModeErr = err
+			return
+		}
+		if systemdVersion >= 236 {
+			systemdHasCollectMode = true
+		}
+	})
+	return systemdHasCollectMode
+}
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -18,6 +18,7 @@ import (
 	createconfig "github.com/containers/libpod/pkg/spec"
 	"github.com/containers/storage"
 	cstorage "github.com/containers/storage"
+	"github.com/cri-o/cri-o/internal/config/node"
 	"github.com/cri-o/cri-o/internal/version"
 	"github.com/cri-o/cri-o/utils"
 	units "github.com/docker/go-units"
@@ -583,6 +584,12 @@ func (c *Config) Validate(systemContext *types.SystemContext, onExecution bool)
 		return fmt.Errorf("unrecognized image volume type specified")
 	}
 
+	if onExecution {
+		if err := node.ValidateConfig(); err != nil {
+			return err
+		}
+	}
+
 	if err := c.RootConfig.Validate(onExecution); err != nil {
 		return errors.Wrapf(err, "root config")
 	}
diff --git a/server/container_create_linux.go b/server/container_create_linux.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/libpod/pkg/rootless"
 	selinux "github.com/containers/libpod/pkg/selinux"
 	createconfig "github.com/containers/libpod/pkg/spec"
+	"github.com/cri-o/cri-o/internal/config/node"
 	"github.com/cri-o/cri-o/internal/lib"
 	"github.com/cri-o/cri-o/internal/lib/sandbox"
 	"github.com/cri-o/cri-o/internal/oci"
@@ -520,6 +521,9 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID, contai
 			if useSystemd {
 				specgen.AddAnnotation("org.systemd.property.TimeoutStopUSec",
 					"uint64 "+t+"000000") // sec to usec
+				if node.SystemdHasCollectMode() {
+					specgen.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
+				}
 			}
 		}
 
diff --git a/server/sandbox_run_linux.go b/server/sandbox_run_linux.go
@@ -18,6 +18,7 @@ import (
 	"github.com/containers/libpod/pkg/annotations"
 	"github.com/containers/libpod/pkg/cgroups"
 	"github.com/containers/storage"
+	"github.com/cri-o/cri-o/internal/config/node"
 	"github.com/cri-o/cri-o/internal/lib"
 	"github.com/cri-o/cri-o/internal/lib/sandbox"
 	"github.com/cri-o/cri-o/internal/oci"
@@ -342,6 +343,10 @@ func (s *Server) runPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
 		g.AddAnnotation("org.opencontainers.image.stopSignal", podContainer.Config.Config.StopSignal)
 	}
 
+	if s.config.CgroupManager == oci.SystemdCgroupsManager && node.SystemdHasCollectMode() {
+		g.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
+	}
+
 	created := time.Now()
 	g.AddAnnotation(annotations.Created, created.Format(time.RFC3339Nano))
 
