Skip to content

Commit 1c559bb

Browse files
committed
fix ovspinning test error
in our cicd, sometimes we noticed ovspinning unit testing error: === RUN TestAlignCPUAffinity I0715 18:20:46.441374 13095 ovspinning_linux_test.go:65] Test CPU Affinity [1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] I0715 18:20:46.441595 13095 ovspinning_linux.go:46] Starting OVS daemon CPU pinning I0715 18:20:46.464072 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13108) (ntasks=15) to 0, was 0-7 I0715 18:20:46.465325 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13107) (ntasks=1) to 0, was 0-7 I0715 18:20:46.484089 13095 ovspinning_linux_test.go:65] Test CPU Affinity [2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] I0715 18:20:46.502727 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13108) (ntasks=15) to 1, was 0 I0715 18:20:46.502910 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13107) (ntasks=1) to 1, was 0 ... I0715 18:20:46.602398 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13108) (ntasks=15) to 5, was 4 I0715 18:20:46.602929 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13107) (ntasks=1) to 5, was 4 I0715 18:20:46.626233 13095 ovspinning_linux_test.go:65] Test CPU Affinity [40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] I0715 18:20:46.642720 13095 ovspinning_linux.go:196] Setting CPU affinity of PID(13108) (ntasks=15) to 6, was 5 ovspinning_linux_test.go:67: Error Trace: /builds/sdn/ovn-kubernetes/go-controller/pkg/node/ovspinning/ovspinning_linux_test.go:251 /builds/sdn/ovn-kubernetes/go-controller/pkg/node/ovspinning/ovspinning_linux_test.go:67 Error: Not equal: expected: unix.CPUSet{0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} actual : unix.CPUSet{0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} Diff: --- Expected +++ Actual @@ -1,3 +1,3 @@ (unix.CPUSet) (len=16) { - (unix.cpuMask) 64, + (unix.cpuMask) 32, (unix.cpuMask) 0, Test: TestAlignCPUAffinity Messages: task[13219] of process[13108] Expected CPUSet [40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] != Actual CPUSet [20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] Signed-off-by: Yun Zhou <[email protected]>
1 parent 356b274 commit 1c559bb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

go-controller/pkg/node/ovspinning/ovspinning_linux_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,12 @@ func assertPIDHasSchedAffinity(t *testing.T, pid int, expectedCPUSet unix.CPUSet
246246
require.NoError(t, err)
247247

248248
for _, task := range tasks {
249-
err := unix.SchedGetaffinity(task, &actual)
250-
require.NoError(t, err)
251-
assert.Equal(t, expectedCPUSet, actual,
252-
"task[%d] of process[%d] Expected CPUSet %0x != Actual CPUSet %0x", task, pid, expectedCPUSet, actual)
249+
assert.Eventually(t, func() bool {
250+
err := unix.SchedGetaffinity(task, &actual)
251+
assert.NoError(t, err)
252+
253+
return actual == expectedCPUSet
254+
}, time.Second, 10*time.Millisecond, "task[%d] of process[%d] Expected CPUSet %0x != Actual CPUSet %0x", task, pid, expectedCPUSet, actual)
253255
}
254256
}
255257

0 commit comments

Comments
 (0)