github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

node: e2e: topology-mgr: Disambiguage cores from cpus

Browse Source 
Currently in the tests there is ambiguity in terms of host setup
when it comes to cpus or cores. This commit disambiguates that.

Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
This commit is contained in:
Swati Sehgal 2023-10-23 12:56:07 +01:00
parent e1f5eb3f14
commit fa83d5fef1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/topology_manager_metrics_test.go
View File

@ -41,7 +41,7 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial] [Feature:TopologyManager]
ginkgo.Context("when querying /metrics", func() { ginkgo.Context("when querying /metrics", func() {
var oldCfg *kubeletconfig.KubeletConfiguration var oldCfg *kubeletconfig.KubeletConfiguration
var testPod *v1.Pod var testPod *v1.Pod
var cpusNumPerNUMA, numaNodes, threadsPerCore int var cpusNumPerNUMA, coresNumPerNUMA, numaNodes, threadsPerCore int
ginkgo.BeforeEach(func(ctx context.Context) { ginkgo.BeforeEach(func(ctx context.Context) {
var err error var err error
@ -50,15 +50,17 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial] [Feature:TopologyManager]
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
numaNodes, cpusNumPerNUMA, threadsPerCore = hostCheck() numaNodes, coresNumPerNUMA, threadsPerCore = hostCheck()
cpusNumPerNUMA = coresNumPerNUMA * threadsPerCore
// It is safe to assume that the CPUs are distributed equally across // It is safe to assume that the CPUs are distributed equally across
// NUMA nodes and therefore number of CPUs on all NUMA nodes are same // NUMA nodes and therefore number of CPUs on all NUMA nodes are same
// so we just check the CPUs on the first NUMA node // so we just check the CPUs on the first NUMA node
framework.Logf("numaNodes on the system %d", numaNodes) framework.Logf("numaNodes on the system %d", numaNodes)
framework.Logf("CPUs per NUMA on the system %d", cpusNumPerNUMA) framework.Logf("Cores per NUMA on the system %d", coresNumPerNUMA)
framework.Logf("Threads per Core on the system %d", threadsPerCore) framework.Logf("Threads per Core on the system %d", threadsPerCore)
framework.Logf("CPUs per NUMA on the system %d", cpusNumPerNUMA)
policy := topologymanager.PolicySingleNumaNode policy := topologymanager.PolicySingleNumaNode
scope := podScopeTopology scope := podScopeTopology