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

Revert "use default value when the specified timeout is 0s"

Browse Source 
This reverts commit 0090e27bd3.
This commit is contained in:
Jordan Liggitt 2020-11-19 18:13:37 -05:00
parent 63d2bf72fa
commit 3e21057070
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go
View File

@ -69,10 +69,7 @@ func WithRequestDeadline(handler http.Handler, longRunning request.LongRunningRe
return return
} }
// if the user has specified a timeout of 0s, this means no timeout, so we should use the maximum timeout allowed. timeout = userSpecifiedTimeout
if userSpecifiedTimeout != 0 {
timeout = userSpecifiedTimeout
}
} }
ctx, cancel := context.WithTimeout(ctx, timeout) ctx, cancel := context.WithTimeout(ctx, timeout)

9
staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go
View File

@ -94,15 +94,6 @@ func TestWithRequestDeadline(t *testing.T) {
deadlineExpected: 14 * time.Second, // to account for the delay in verification deadlineExpected: 14 * time.Second, // to account for the delay in verification
statusCodeExpected: http.StatusOK, statusCodeExpected: http.StatusOK,
}, },
{
name: "the specified timeout is 0s, default deadline is expected to be set",
requestURL: "/api/v1/namespaces?timeout=0s",
longRunning: false,
handlerCallCountExpected: 1,
hasDeadlineExpected: true,
deadlineExpected: requestTimeoutMaximum - time.Second, // to account for the delay in verification
statusCodeExpected: http.StatusOK,
},
{ {
name: "the user does not specify any request timeout, default deadline is expected to be set", name: "the user does not specify any request timeout, default deadline is expected to be set",
requestURL: "/api/v1/namespaces?timeout=", requestURL: "/api/v1/namespaces?timeout=",