github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102967 from aojea/goaway

Browse Source 
deflake TestClientReceivedGOAWAY test
This commit is contained in:
Kubernetes Prow Robot 2021-06-21 19:24:05 -07:00 committed by GitHub
commit 2495ec7f11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go
View File

@ -190,38 +190,6 @@ type watchResponse struct {
err error
}
// newGOAWAYClient return a configured http client which used to request test GOAWAY server, a dial may specified
// to encounter the TCP connection.
func newGOAWAYClient(dial func(network, addr string, cfg *tls.Config) (net.Conn, error)) (*http.Client, error) {
tlsConfig := &tls.Config{
InsecureSkipVerify: true,
NextProtos: []string{http2.NextProtoTLS},
}
tr := &http.Transport{
Proxy: http.ProxyFromEnvironment,
TLSHandshakeTimeout: 10 * time.Second,
TLSClientConfig: tlsConfig,
MaxIdleConnsPerHost: 25,
DialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
if dial != nil {
return dial(network, addr, tlsConfig)
}
return tls.Dial(network, addr, tlsConfig)
},
}
if err := http2.ConfigureTransport(tr); err != nil {
return nil, err
}
client := &http.Client{
Transport: tr,
}
return client, nil
}
// requestGOAWAYServer request test GOAWAY server using specified method and data according to the given url.
// A non-nil channel will be returned if the request is watch, and a watchResponse can be got from the channel when watch done.
func requestGOAWAYServer(client *http.Client, serverBaseURL, url string) (<-chan watchResponse, error) {
@ -299,8 +267,6 @@ func requestGOAWAYServer(client *http.Client, serverBaseURL, url string) (<-chan
// TestClientReceivedGOAWAY tests the in-flight watch requests will not be affected and new requests use a new
// connection after client received GOAWAY.
func TestClientReceivedGOAWAY(t *testing.T) {
t.Skip("disabled because of https://github.com/kubernetes/kubernetes/issues/94622")
s, err := newTestGOAWAYServer()
if err != nil {
t.Fatalf("failed to set-up test GOAWAY http server, err: %v", err)
@ -344,23 +310,39 @@ func TestClientReceivedGOAWAY(t *testing.T) {
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
var mu sync.Mutex
// localAddr indicates how many TCP connection set up
localAddr := make([]string, 0)
client, err := newGOAWAYClient(func(network, addr string, cfg *tls.Config) (conn net.Conn, err error) {
// create the http client
dialFn := func(network, addr string, cfg *tls.Config) (conn net.Conn, err error) {
conn, err = tls.Dial(network, addr, cfg)
if err != nil {
t.Fatalf("unexpect connection err: %v", err)
}
mu.Lock()
localAddr = append(localAddr, conn.LocalAddr().String())
mu.Unlock()
return
})
if err != nil {
t.Fatalf("failed to set-up client, err: %v", err)
}
tlsConfig := &tls.Config{
InsecureSkipVerify: true,
NextProtos: []string{http2.NextProtoTLS},
}
tr := &http.Transport{
TLSHandshakeTimeout: 10 * time.Second,
TLSClientConfig: tlsConfig,
// Disable connection pooling to avoid additional connections
// that cause the test to flake
MaxIdleConnsPerHost: -1,
DialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
return dialFn(network, addr, tlsConfig)
},
}
if err := http2.ConfigureTransport(tr); err != nil {
t.Fatalf("failed to configure http transport, err: %v", err)
}
client := &http.Client{
Transport: tr,
}
watchChs := make([]<-chan watchResponse, 0)
@ -447,7 +429,23 @@ func TestGOAWAYConcurrency(t *testing.T) {
s.StartTLS()
defer s.Close()
client, err := newGOAWAYClient(nil)
// create the http client
tlsConfig := &tls.Config{
InsecureSkipVerify: true,
NextProtos: []string{http2.NextProtoTLS},
}
tr := &http.Transport{
TLSHandshakeTimeout: 10 * time.Second,
TLSClientConfig: tlsConfig,
MaxIdleConnsPerHost: 25,
}
if err := http2.ConfigureTransport(tr); err != nil {
t.Fatalf("failed to configure http transport, err: %v", err)
}
client := &http.Client{
Transport: tr,
}
if err != nil {
t.Fatalf("failed to set-up client, err: %v", err)
}