github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client-go: copying object to fix data race (#103148)

Browse Source
This commit is contained in:
novahe
2021-07-05 21:55:55 +08:00
parent 5fe522c237
commit ce257266aa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/client-go/testing/fixture.go
View File

@@ -400,7 +400,8 @@ func (t *tracker) add(gvr schema.GroupVersionResource, obj runtime.Object, ns st
if _, ok = t.objects[gvr][namespacedName]; ok { if _, ok = t.objects[gvr][namespacedName]; ok {
if replaceExisting { if replaceExisting {
for _, w := range t.getWatches(gvr, ns) { for _, w := range t.getWatches(gvr, ns) {
w.Modify(obj) // To avoid the object from being accidentally modified by watcher
w.Modify(obj.DeepCopyObject())
} }
t.objects[gvr][namespacedName] = obj t.objects[gvr][namespacedName] = obj
return nil return nil
@@ -416,7 +417,8 @@ func (t *tracker) add(gvr schema.GroupVersionResource, obj runtime.Object, ns st
t.objects[gvr][namespacedName] = obj t.objects[gvr][namespacedName] = obj
for _, w := range t.getWatches(gvr, ns) { for _, w := range t.getWatches(gvr, ns) {
w.Add(obj) // To avoid the object from being accidentally modified by watcher
w.Add(obj.DeepCopyObject())
} }
return nil return nil
@@ -456,7 +458,7 @@ func (t *tracker) Delete(gvr schema.GroupVersionResource, ns, name string) error
delete(objs, namespacedName) delete(objs, namespacedName)
for _, w := range t.getWatches(gvr, ns) { for _, w := range t.getWatches(gvr, ns) {
w.Delete(obj) w.Delete(obj.DeepCopyObject())
} }
return nil return nil
} }