Skip to content

OCPBUGS-62702: AA: latency-e2e: skip tests on HT-disabled systems #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-62702: AA: latency-e2e: skip tests on HT-disabled systems #1386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 47 additions & 4 deletions test/e2e/performanceprofile/functests/5_latency_testing/latency_testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package __latency_testing

import (
"bytes"
"context"
"fmt"
"math"
"os"
Expand All @@ -12,7 +13,12 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/format"
"k8s.io/utils/cpuset"

testutils "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils"
testlog "github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/log"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/nodes"
"github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/profiles"
)

// TODO get commonly used variables from one shared file that defines constants
Expand Down Expand Up @@ -219,6 +225,37 @@ func clearEnv() {
os.Unsetenv(latencyTestCpus)
}

// checkHyperthreading determines if the BZ 2094046 test should run based on HT status.
// Returns true if the test should run (HT enabled), false if it should be skipped (HT disabled).
func checkHyperthreading() (bool, error) {
profile, err := profiles.GetByNodeLabels(testutils.NodeSelectorLabels)
if err != nil {
return false, fmt.Errorf("get performance profile: %w", err)
}

workerNodes, err := nodes.GetByLabels(testutils.NodeSelectorLabels)
if err != nil {
return false, fmt.Errorf("get worker nodes: %w", err)
}
workerNode := &workerNodes[0]
Comment on lines +236 to +240
Copy link
Contributor

@ffromani ffromani Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to pick a random node which matches the labels? can't we just pick the node by name?

Copy link
Contributor Author

@SargunNarula SargunNarula Sep 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By specifying index 0, we fix the node among those that have the appropriate labels. To ensures that if a performance profile has applied any kernel argument, such as nosmt, we can verify it through an actual runtime check.

Copy link
Contributor

@ffromani ffromani Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, but I still don't follow why we need to use `the node selector labels vs picking a specific node and checking that node


ctx := context.Background()
set, err := cpuset.Parse(string(*profile.Spec.CPU.Isolated))
if err != nil || set.Size() == 0 {
return false, fmt.Errorf("failed to parse isolated CPUs from profile")
}
cpuID := set.List()[0]
Comment on lines +243 to +247
Copy link
Contributor

@ffromani ffromani Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't get why this code is better than just checking cpuID 0 (which is much simpler) or the kernel command line arguments (/proc/cmdline)


smtLevel, err := nodes.GetSMTLevel(ctx, cpuID, workerNode)
if err != nil {
return false, fmt.Errorf("failed to get SMT level for CPU %d on node %s: %w", cpuID, workerNode.Name, err)
}
isHTEnabled := smtLevel > 1
testlog.Infof("Hyperthreading status on node %s (CPU %d): %t", workerNode.Name, cpuID, isHTEnabled)

return isHTEnabled, nil
}

func getValidValuesTests(toolToTest string) []latencyTest {
var testSet []latencyTest

Expand Down Expand Up @@ -283,15 +320,21 @@ func getNegativeTests(toolToTest string) []latencyTest {
testSet = append(testSet, latencyTest{testRuntime: "2", oslatMaxLatency: "&", outputMsgs: []string{incorrectOslatMaxLatency, fail}, toolToTest: toolToTest})
testSet = append(testSet, latencyTest{testRuntime: "2", oslatMaxLatency: fmt.Sprint(math.MaxInt32 + 1), outputMsgs: []string{invalidNumberOslatMaxLatency, fail}, toolToTest: toolToTest})
testSet = append(testSet, latencyTest{testRuntime: "2", oslatMaxLatency: "-3", outputMsgs: []string{invalidNumberOslatMaxLatency, fail}, toolToTest: toolToTest})
// Covers the scenario of BZ 2094046
testSet = append(testSet, latencyTest{testRuntime: "2", testCpus: "2", outputMsgs: []string{unexpectedError, fail}, toolToTest: toolToTest})
// BZ 2094046: only add this test if HT is enabled
htEnabled, htErr := checkHyperthreading()
if htErr == nil && htEnabled {
testSet = append(testSet, latencyTest{testRuntime: "2", testCpus: "2", oslatMaxLatency: untunedLatencyThreshold, outputMsgs: []string{unexpectedError, fail}, toolToTest: toolToTest})
}
}
if toolToTest == cyclictest {
testSet = append(testSet, latencyTest{testRuntime: "2", cyclictestMaxLatency: "&", outputMsgs: []string{incorrectCyclictestMaxLatency, fail}, toolToTest: toolToTest})
testSet = append(testSet, latencyTest{testRuntime: "2", cyclictestMaxLatency: fmt.Sprint(math.MaxInt32 + 1), outputMsgs: []string{invalidNumberCyclictestMaxLatency, fail}, toolToTest: toolToTest})
testSet = append(testSet, latencyTest{testRuntime: "2", cyclictestMaxLatency: "-3", outputMsgs: []string{invalidNumberCyclictestMaxLatency, fail}, toolToTest: toolToTest})
// Covers the scenario of BZ 2094046
testSet = append(testSet, latencyTest{testRuntime: "2", testCpus: "2", outputMsgs: []string{unexpectedError, fail}, toolToTest: toolToTest})
// BZ 2094046: only add this test if HT is enabled
htEnabled, htErr := checkHyperthreading()
if htErr == nil && htEnabled {
testSet = append(testSet, latencyTest{testRuntime: "2", testCpus: "2", cyclictestMaxLatency: untunedLatencyThreshold, outputMsgs: []string{unexpectedError, fail}, toolToTest: toolToTest})
}
}
if toolToTest == hwlatdetect {
testSet = append(testSet, latencyTest{testRuntime: "2", hwlatdetectMaxLatency: "&", outputMsgs: []string{incorrectHwlatdetectMaxLatency, fail}, toolToTest: toolToTest})
Expand Down