kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116251 from wojtek-t/fix_ready_test 

Fix deadlock in ready test

Kubernetes-commit: a1b12e49eac237a37939642d0c3395008b9ab380
This commit is contained in:
Kubernetes Publisher 2023-03-03 10:25:19 -08:00
parent 24494ec75b ba5f84614d
commit b623fd4d28
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -42,7 +42,7 @@ require (
google.golang.org/protobuf v1.28.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20230302120942-f6c2559ad4f4
k8s.io/api v0.0.0-20230303200230-53d84c07e349
k8s.io/apimachinery v0.0.0-20230302115847-76eb944e266d
k8s.io/client-go v0.0.0-20230303065657-bfa72fd2d367
k8s.io/component-base v0.0.0-20230302013528-cdd3d3a94e73
@ -124,7 +124,7 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230302120942-f6c2559ad4f4
k8s.io/api => k8s.io/api v0.0.0-20230303200230-53d84c07e349
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230302115847-76eb944e266d
k8s.io/client-go => k8s.io/client-go v0.0.0-20230303065657-bfa72fd2d367
k8s.io/component-base => k8s.io/component-base v0.0.0-20230302013528-cdd3d3a94e73

4
go.sum
View File

@ -874,8 +874,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230302120942-f6c2559ad4f4 h1:qm5Xz7wiOrtVHPKAZsBByEd6k2WST6Ts+e4RfpgVuvQ=
k8s.io/api v0.0.0-20230302120942-f6c2559ad4f4/go.mod h1:cTD04/XhoraqP0GpFXtefYJYXBw6coqVSibz5Rzivkw=
k8s.io/api v0.0.0-20230303200230-53d84c07e349 h1:JrCFX5tFEUBeCxWKuwKOMMPrqQURj/83ntT/KgjdrOc=
k8s.io/api v0.0.0-20230303200230-53d84c07e349/go.mod h1:cTD04/XhoraqP0GpFXtefYJYXBw6coqVSibz5Rzivkw=
k8s.io/apimachinery v0.0.0-20230302115847-76eb944e266d h1:mridg1Zm6thnb5oTe+rOGnEUbPnjys9YHBFxlOf+GeA=
k8s.io/apimachinery v0.0.0-20230302115847-76eb944e266d/go.mod h1:TO4higCGNMwebVSdb1XPJdXMU4kk+nmMY/cTMVCGa6M=
k8s.io/client-go v0.0.0-20230303065657-bfa72fd2d367 h1:y1rUzE1VGpnWqpVBHXCOp8BlmTtZ3bU6I8L5xAQd3gg=

9
pkg/storage/cacher/ready_test.go
View File

@ -18,6 +18,7 @@ package cacher
import (
"context"
"sync"
"testing"
"time"
)
@ -81,18 +82,26 @@ func Test_newReadyRacy(t *testing.T) {
errCh := make(chan error, concurrency)
ready := newReady()
ready.set(false)
wg := sync.WaitGroup{}
wg.Add(2 * concurrency)
for i := 0; i < concurrency; i++ {
go func() {
errCh <- ready.wait(context.Background())
}()
go func() {
defer wg.Done()
ready.set(false)
}()
go func() {
defer wg.Done()
ready.set(true)
}()
}
// Last one has to be set to true.
wg.Wait()
ready.set(true)
for i := 0; i < concurrency; i++ {
if err := <-errCh; err != nil {
t.Errorf("unexpected error %v on channel %d", err, i)