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

use default value when the specified timeout is 0s

Browse Source
This commit is contained in:
Abu Kashem 2020-11-18 12:01:27 -05:00
parent 6dddea5abf
commit 0090e27bd3
No known key found for this signature in database
GPG Key ID: 76146D1A14E658ED
2 changed files with 13 additions and 1 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,7 +69,10 @@ func WithRequestDeadline(handler http.Handler, longRunning request.LongRunningRe
return
}
timeout = userSpecifiedTimeout
// if the user has specified a timeout of 0s, this means no timeout, so we should use the maximum timeout allowed.
if userSpecifiedTimeout != 0 {
timeout = userSpecifiedTimeout
}
}
ctx, cancel := context.WithTimeout(ctx, timeout)

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

@ -94,6 +94,15 @@ func TestWithRequestDeadline(t *testing.T) {
deadlineExpected: 14 * time.Second, // to account for the delay in verification
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",
requestURL: "/api/v1/namespaces?timeout=",