Merge pull request #57700 from porridge/improve-msg-conn-kill

Automatic merge from submit-queue. 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>. Improve the error message. **What this PR does / why we need it**: Makes the error message more descriptive and less scary. Previously it is far from obvious whether connection kill is a symptom or cause of the problem, see for example https://github.com/kubernetes/kubernetes/issues/55779#issuecomment-353582852 In paricular the crucial missing piece of information is that this is a way of handling a timeout. **Release note**: ```release-note NONE ```

Merge pull request #57700 from porridge/improve-msg-conn-kill
f9c3a0ab · Kubernetes Submit Queue · GitHub · 11ecad26 · 1ecd4bb2 · f9c3a0ab
Unverified Commit f9c3a0ab authored Feb 16, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

timeout.go staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
@@ -30,7 +30,7 @@ import (
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 )

-var errConnKilled = fmt.Errorf("kill connection/stream")
+var errConnKilled = fmt.Errorf("killing connection/stream because serving request timed out and response had been started")

 // WithTimeoutForNonLongRunningRequests times out non-long-running requests after the time given by timeout.
 func WithTimeoutForNonLongRunningRequests(handler http.Handler, requestContextMapper apirequest.RequestContextMapper, longRunning apirequest.LongRunningRequestCheck, timeout time.Duration) http.Handler {