cri: fix handling of ignore_rdt_not_enabled_errors config option

marquiz · marquiz · commit 9b1fb82584b6 · 2022-02-04T13:54:03.000+02:00
We were not properly ignoring errors from
gorestrl.rdt.ContainerClassFromAnnotations() causing the config option
to be ineffective, in practice.

Signed-off-by: Markus Lehtonen &lt;markus.lehtonen@intel.com&gt;
diff --git a/pkg/cri/server/rdt_linux.go b/pkg/cri/server/rdt_linux.go
@@ -31,17 +31,21 @@ import (
 // container and returns its effective RDT class.
 func (c *criService) rdtClassFromAnnotations(containerName string, containerAnnotations, podAnnotations map[string]string) (string, error) {
 	cls, err := rdt.ContainerClassFromAnnotations(containerName, containerAnnotations, podAnnotations)
-	if err != nil {
-		return "", err
+
+	if err == nil {
+		// Our internal check that RDT has been enabled
+		if cls != "" && !tasks.RdtEnabled() {
+			err = fmt.Errorf("RDT disabled, refusing to set RDT class of container %q to %q", containerName, cls)
+		}
 	}
 
-	if cls != "" && !tasks.RdtEnabled() {
-		if c.config.ContainerdConfig.IgnoreRdtNotEnabledErrors {
-			cls = ""
+	if err != nil {
+		if !tasks.RdtEnabled() && c.config.ContainerdConfig.IgnoreRdtNotEnabledErrors {
 			logrus.Debugf("continuing create container %s, ignoring rdt not enabled (%v)", containerName, err)
-		} else {
-			return "", fmt.Errorf("RDT disabled, refusing to set RDT class of container %q to %q", containerName, cls)
+			return "", nil
 		}
+		return "", err
 	}
+
 	return cls, nil
 }
