github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107992 from tkashem/flake-timeout

Browse Source 
fix flake in TestTimeoutHeaders
This commit is contained in:
Kubernetes Prow Robot 2022-02-07 19:20:53 -08:00 committed by GitHub
commit 5cee90c305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
View File

@ -138,7 +138,7 @@ func (t *timeoutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}() }()
}() }()
postTimeoutFn() defer postTimeoutFn()
tw.timeout(err) tw.timeout(err)
} }
} }

12
staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go
View File

@ -219,6 +219,7 @@ func TestTimeoutHeaders(t *testing.T) {
}) })
} }
postTimeoutCh := make(chan struct{})
ts := httptest.NewServer( ts := httptest.NewServer(
withDeadline( withDeadline(
WithTimeout( WithTimeout(
@ -226,13 +227,18 @@ func TestTimeoutHeaders(t *testing.T) {
h := w.Header() h := w.Header()
// trigger the timeout // trigger the timeout
cancel() cancel()
// mutate response Headers // keep mutating response Headers until the request times out
for j := 0; j < 1000; j++ { for {
select {
case <-postTimeoutCh:
return
default:
h.Set("Test", "post") h.Set("Test", "post")
} }
}
}), }),
func(req *http.Request) (*http.Request, bool, func(), *apierrors.StatusError) { func(req *http.Request) (*http.Request, bool, func(), *apierrors.StatusError) {
return req, false, func() {}, apierrors.NewServerTimeout(schema.GroupResource{Group: "foo", Resource: "bar"}, "get", 0) return req, false, func() { close(postTimeoutCh) }, apierrors.NewServerTimeout(schema.GroupResource{Group: "foo", Resource: "bar"}, "get", 0)
}, },
), ),
), ),