github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

fix: avoid errors from the race condition detector

Browse Source
This commit is contained in:
Kensei Nakada 2024-11-05 01:11:48 +09:00
parent c322294883
commit 3124c5bd56
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/scheduler/framework/preemption/preemption_test.go
View File

@ -22,6 +22,7 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"sort" "sort"
"sync"
"testing" "testing"
"time" "time"
@ -90,9 +91,12 @@ func (pl *FakePostFilterPlugin) OrderedScoreFuncs(ctx context.Context, nodesToVi
type fakePodActivator struct { type fakePodActivator struct {
activatedPods map[string]*v1.Pod activatedPods map[string]*v1.Pod
mu *sync.RWMutex
} }
func (f *fakePodActivator) Activate(logger klog.Logger, pods map[string]*v1.Pod) { func (f *fakePodActivator) Activate(logger klog.Logger, pods map[string]*v1.Pod) {
f.mu.Lock()
defer f.mu.Unlock()
for name, pod := range pods { for name, pod := range pods {
f.activatedPods[name] = pod f.activatedPods[name] = pod
} }
@ -626,6 +630,7 @@ func TestPrepareCandidate(t *testing.T) {
} }
requestStopper := make(chan struct{}) requestStopper := make(chan struct{})
mu := &sync.RWMutex{}
deletedPods := sets.New[string]() deletedPods := sets.New[string]()
deletionFailure := false // whether any request to delete pod failed deletionFailure := false // whether any request to delete pod failed
patchFailure := false // whether any request to patch pod status failed patchFailure := false // whether any request to patch pod status failed
@ -633,6 +638,8 @@ func TestPrepareCandidate(t *testing.T) {
cs := clientsetfake.NewClientset(objs...) cs := clientsetfake.NewClientset(objs...)
cs.PrependReactor("delete", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) { cs.PrependReactor("delete", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) {
<-requestStopper <-requestStopper
mu.Lock()
defer mu.Unlock()
name := action.(clienttesting.DeleteAction).GetName() name := action.(clienttesting.DeleteAction).GetName()
if name == "fail-victim" { if name == "fail-victim" {
deletionFailure = true deletionFailure = true
@ -645,6 +652,8 @@ func TestPrepareCandidate(t *testing.T) {
cs.PrependReactor("patch", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) { cs.PrependReactor("patch", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) {
<-requestStopper <-requestStopper
mu.Lock()
defer mu.Unlock()
if action.(clienttesting.PatchAction).GetName() == "fail-victim" { if action.(clienttesting.PatchAction).GetName() == "fail-victim" {
patchFailure = true patchFailure = true
return true, nil, fmt.Errorf("patch pod status failed") return true, nil, fmt.Errorf("patch pod status failed")
@ -654,7 +663,7 @@ func TestPrepareCandidate(t *testing.T) {
informerFactory := informers.NewSharedInformerFactory(cs, 0) informerFactory := informers.NewSharedInformerFactory(cs, 0)
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: cs.EventsV1()}) eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: cs.EventsV1()})
fakeActivator := &fakePodActivator{activatedPods: make(map[string]*v1.Pod)} fakeActivator := &fakePodActivator{activatedPods: make(map[string]*v1.Pod), mu: mu}
fwk, err := tf.NewFramework( fwk, err := tf.NewFramework(
ctx, ctx,
registeredPlugins, "", registeredPlugins, "",
@ -709,6 +718,8 @@ func TestPrepareCandidate(t *testing.T) {
var lastErrMsg string var lastErrMsg string
if err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, wait.ForeverTestTimeout, false, func(ctx context.Context) (bool, error) { if err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, wait.ForeverTestTimeout, false, func(ctx context.Context) (bool, error) {
mu.RLock()
defer mu.RUnlock()
if !deletedPods.Equal(sets.New(tt.expectedDeletedPods...)) { if !deletedPods.Equal(sets.New(tt.expectedDeletedPods...)) {
lastErrMsg = fmt.Sprintf("expected deleted pods %v, got %v", tt.expectedDeletedPods, deletedPods.UnsortedList()) lastErrMsg = fmt.Sprintf("expected deleted pods %v, got %v", tt.expectedDeletedPods, deletedPods.UnsortedList())
return false, nil return false, nil