github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-17 14:56:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98496 from lavalamp/connrotation

Browse Source 
Remove unbounded connection creation; also change worst case delay from 50s to 5s

Kubernetes-commit: 9f2f1b8c460b4b5ec8bfcd34490fb259ebad65b0
This commit is contained in:
Kubernetes Publisher 2021-01-27 20:03:07 -08:00
commit 6329432013
4 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -460,11 +460,11 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "c873f2e8ab25" "Rev": "9b864a59b88a"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "460d10991a52" "Rev": "87c8a9682ad2"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

8
go.mod
View File

@ -26,14 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
k8s.io/api v0.0.0-20210115125903-c873f2e8ab25 k8s.io/api v0.0.0-20210127121017-9b864a59b88a
k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52 k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210115125903-c873f2e8ab25 k8s.io/api => k8s.io/api v0.0.0-20210127121017-9b864a59b88a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2
) )

4
go.sum
View File

@ -427,8 +427,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210115125903-c873f2e8ab25/go.mod h1:xpUvIW3IJYnKO2yMuT9r4zCZI1ppqiuEejNFI9eoqWo= k8s.io/api v0.0.0-20210127121017-9b864a59b88a/go.mod h1:Xl2Mk6qqDyNSEdMHf68J4XroyUwxOLfYgiq4/1Ii9ac=
k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=

41
util/connrotation/connrotation_test.go
View File

@ -26,7 +26,7 @@ import (
) )
func TestCloseAll(t *testing.T) { func TestCloseAll(t *testing.T) {
closed := make(chan struct{}) closed := make(chan struct{}, 50)
dialFn := func(ctx context.Context, network, address string) (net.Conn, error) { dialFn := func(ctx context.Context, network, address string) (net.Conn, error) {
return closeOnlyConn{onClose: func() { closed <- struct{}{} }}, nil return closeOnlyConn{onClose: func() { closed <- struct{}{} }}, nil
} }
@ -42,10 +42,11 @@ func TestCloseAll(t *testing.T) {
} }
} }
dialer.CloseAll() dialer.CloseAll()
deadline := time.After(time.Second)
for j := 0; j < numConns; j++ { for j := 0; j < numConns; j++ {
select { select {
case <-closed: case <-closed:
case <-time.After(time.Second): case <-deadline:
t.Fatalf("iteration %d: 1s after CloseAll only %d/%d connections closed", i, j, numConns) t.Fatalf("iteration %d: 1s after CloseAll only %d/%d connections closed", i, j, numConns)
} }
} }
@ -59,48 +60,42 @@ func TestCloseAllRace(t *testing.T) {
return closeOnlyConn{onClose: func() { atomic.AddInt64(&conns, -1) }}, nil return closeOnlyConn{onClose: func() { atomic.AddInt64(&conns, -1) }}, nil
}) })
done := make(chan struct{}) const raceCount = 5000
begin := &sync.WaitGroup{}
begin.Add(1)
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
// Close all as fast as we can // Close all as fast as we can
wg.Add(1) wg.Add(1)
go func() { go func() {
begin.Wait()
defer wg.Done() defer wg.Done()
for { for i := 0; i < raceCount; i++ {
select { dialer.CloseAll()
case <-done:
return
default:
dialer.CloseAll()
}
} }
}() }()
// Dial as fast as we can // Dial as fast as we can
wg.Add(1) wg.Add(1)
go func() { go func() {
begin.Wait()
defer wg.Done() defer wg.Done()
for { for i := 0; i < raceCount; i++ {
select { if _, err := dialer.Dial("", ""); err != nil {
case <-done: t.Error(err)
return return
default:
if _, err := dialer.Dial("", ""); err != nil {
t.Error(err)
return
}
atomic.AddInt64(&conns, 1)
} }
atomic.AddInt64(&conns, 1)
} }
}() }()
// Soak to ensure no races // Trigger both goroutines as close to the same time as possible
time.Sleep(time.Second) begin.Done()
// Signal completion
close(done)
// Wait for goroutines // Wait for goroutines
wg.Wait() wg.Wait()
// Ensure CloseAll ran after all dials // Ensure CloseAll ran after all dials
dialer.CloseAll() dialer.CloseAll()