github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #55348 from jpbetz/fix-testcrd-race 

Automatic merge from submit-queue (batch tested with PRs 55092, 55348, 55095, 55277, 55352). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix data race in TestCRD

Fix this race:
```
==================
WARNING: DATA RACE
Write at 0x00c42a845350 by goroutine 748:
  k8s.io/kubernetes/cmd/kube-apiserver/app/testing.TestCRD()
      cmd/kube-apiserver/app/testing/server_test.go:257 +0x15da
  testing.tRunner()
      /root/.cache/bazel/_bazel_root/e9f728bbd90b3fba632eb31b20e1dacd/external/go_sdk/src/testing/testing.go:746 +0x16c

Previous write at 0x00c42a845350 by goroutine 481:
  k8s.io/kubernetes/cmd/kube-apiserver/app/testing.TestCRD.func2()
      cmd/kube-apiserver/app/testing/server_test.go:250 +0x241
```

Related to #54095
pull/6/head
Kubernetes Submit Queue 2017-11-08 21:18:19 -08:00 committed by GitHub
parent 2ee10cc73e df4f693b3b
commit 8a9d44913b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/testing/server_test.go
View File

@ -247,7 +247,7 @@ func TestCRD(t *testing.T) {
}
createErr := make(chan error, 1)
go func() {
_, err = barComClient.Resource(&metav1.APIResource{Name: "foos", Namespaced: true}, "default").Create(unstructuredFoo)
_, err := barComClient.Resource(&metav1.APIResource{Name: "foos", Namespaced: true}, "default").Create(unstructuredFoo)
t.Logf("Foo instance create returned: %v", err)
if err != nil {
createErr <- err