cnf-tests: Improve NUMA cpuset retrieval

Guaranteed workload pod can be in a different cgroup if on the node there have been applied a PerformanceProfile. The Cluster Node Tuning Operator configures the cpuset cgroup on specific condition and it doesn't come back to the original configuration when the node is moved to a differenent MachineConfigPool. Refs: https://github.com/openshift/cluster-node-tuning-operator/blob/a4c70abb71036341dfaf0cac30dab0d166e55cbd/assets/performanceprofile/scripts/cpuset-configure.sh#L9 Signed-off-by: Andrea Panattoni <[email protected]>
openshift-kni · Aug 24, 2023 · af2a47c · af2a47c
1 parent 8859899
commit af2a47c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cnf-tests/testsuites/e2esuite/dpdk/dpdk.go b/cnf-tests/testsuites/e2esuite/dpdk/dpdk.go
@@ -1097,7 +1097,7 @@ func findNUMAForCPUs(pod *corev1.Pod, cpuList []string) (int, error) {
 	}
 
 	if !findCPUOnSameNuma {
-		return numaNode, fmt.Errorf("not all the cpus are in the same numa node")
+		return numaNode, fmt.Errorf("not all the cpus are in the same numa node. cpuList[%v] lscpu[%s]", cpuList, buff.String())
 	}
 
 	return numaNode, nil

diff --git a/cnf-tests/testsuites/e2esuite/dpdk/numa_node_sriov.go b/cnf-tests/testsuites/e2esuite/dpdk/numa_node_sriov.go
@@ -395,8 +395,12 @@ func findDevicesOnNUMANode(node *corev1.Node, devices []*sriovv1.InterfaceExt, n
 }
 
 func expectPodCPUsAreOnNUMANode(pod *corev1.Pod, expectedCPUsNUMA int) {
-
-	buff, err := pods.ExecCommand(client.Client, *pod, []string{"cat", "/sys/fs/cgroup/cpuset.cpus"})
+	// Guaranteed workload pod can be in a different cgroup
+	// if on the node there have ever been applied a PerformanceProfile, no matter if it's not active at the moment.
+	//
+	// https://github.com/openshift/cluster-node-tuning-operator/blob/a4c70abb71036341dfaf0cac30dab0d166e55cbd/assets/performanceprofile/scripts/cpuset-configure.sh#L9
+	buff, err := pods.ExecCommand(client.Client, *pod, []string{"sh", "-c",
+		"cat /sys/fs/cgroup/cpuset/cpuset.cpus 2>/dev/null || cat /sys/fs/cgroup/cpuset.cpus 2>/dev/null"})
 	ExpectWithOffset(1, err).ToNot(HaveOccurred())
 
 	cpuList, err := getCpuSet(buff.String())