github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

dra scheduler: fix data race in unit test

Browse Source 
Clearing some irrelevant fields in objects caused a flaky data race alert
because in some cases, the objects were pointers into a shared cache. A better
solution is to treat the objects as read-only and ignore the irrelevant fields.
This commit is contained in:
Patrick Ohly 2024-04-19 17:14:13 +02:00
parent f39ece24b2
commit a66d2163f9
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go
View File

@ -26,6 +26,7 @@ import (
"time" "time"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -1172,10 +1173,8 @@ func (tc *testContext) verify(t *testing.T, expected result, initialObjects []me
} }
} }
sortObjects(wantObjects) sortObjects(wantObjects)
stripObjects(wantObjects)
stripObjects(objects)
// Sometimes assert strips the diff too much, let's do it ourselves... // Sometimes assert strips the diff too much, let's do it ourselves...
if diff := cmp.Diff(wantObjects, objects); diff != "" { if diff := cmp.Diff(wantObjects, objects, cmpopts.IgnoreFields(metav1.ObjectMeta{}, "UID", "ResourceVersion")); diff != "" {
t.Errorf("Stored objects are different (- expected, + actual):\n%s", diff) t.Errorf("Stored objects are different (- expected, + actual):\n%s", diff)
} }
@ -1184,31 +1183,17 @@ func (tc *testContext) verify(t *testing.T, expected result, initialObjects []me
expectAssumedClaims = append(expectAssumedClaims, expected.assumedClaim) expectAssumedClaims = append(expectAssumedClaims, expected.assumedClaim)
} }
actualAssumedClaims := tc.listAssumedClaims() actualAssumedClaims := tc.listAssumedClaims()
assert.Equal(t, expectAssumedClaims, actualAssumedClaims, "assumed claims") if diff := cmp.Diff(expectAssumedClaims, actualAssumedClaims, cmpopts.IgnoreFields(metav1.ObjectMeta{}, "UID", "ResourceVersion")); diff != "" {
t.Errorf("Assumed claims are different (- expected, + actual):\n%s", diff)
}
var expectInFlightClaims []metav1.Object var expectInFlightClaims []metav1.Object
if expected.inFlightClaim != nil { if expected.inFlightClaim != nil {
expectInFlightClaims = append(expectInFlightClaims, expected.inFlightClaim) expectInFlightClaims = append(expectInFlightClaims, expected.inFlightClaim)
} }
actualInFlightClaims := tc.listInFlightClaims() actualInFlightClaims := tc.listInFlightClaims()
assert.Equal(t, expectInFlightClaims, actualInFlightClaims, "in-flight claims") if diff := cmp.Diff(expectInFlightClaims, actualInFlightClaims, cmpopts.IgnoreFields(metav1.ObjectMeta{}, "UID", "ResourceVersion")); diff != "" {
} t.Errorf("In-flight claims are different (- expected, + actual):\n%s", diff)
// setGVK is implemented by metav1.TypeMeta and thus all API objects, in
// contrast to metav1.Type, which is not (?!) implemented.
type setGVK interface {
SetGroupVersionKind(gvk schema.GroupVersionKind)
}
// stripObjects removes certain fields (Kind, APIVersion, etc.) which are not
// important and might not be set.
func stripObjects(objects []metav1.Object) {
for _, obj := range objects {
obj.SetResourceVersion("")
obj.SetUID("")
if objType, ok := obj.(setGVK); ok {
objType.SetGroupVersionKind(schema.GroupVersionKind{})
}
} }
} }
@ -1242,7 +1227,6 @@ func (tc *testContext) listAssumedClaims() []metav1.Object {
} }
} }
sortObjects(assumedClaims) sortObjects(assumedClaims)
stripObjects(assumedClaims)
return assumedClaims return assumedClaims
} }
@ -1253,7 +1237,6 @@ func (tc *testContext) listInFlightClaims() []metav1.Object {
return true return true
}) })
sortObjects(inFlightClaims) sortObjects(inFlightClaims)
stripObjects(inFlightClaims)
return inFlightClaims return inFlightClaims
} }