Unverified Commit a21fdbd7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #66459 from joejulian/automated-cherry-pick-of-#66264-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #66264: extend timeout to workaround slow arm64 math Cherry pick of #66264 on release-1.10. #66264: extend timeout to workaround slow arm64 math
parents 3ea683c1 05876fa6
...@@ -29,14 +29,15 @@ import ( ...@@ -29,14 +29,15 @@ import (
"k8s.io/apiserver/pkg/storage/value" "k8s.io/apiserver/pkg/storage/value"
) )
var ( // The short keepalive timeout and interval have been chosen to aggressively
// The short keepalive timeout and interval have been chosen to aggressively // detect a failed etcd server without introducing much overhead.
// detect a failed etcd server without introducing much overhead. const keepaliveTime = 30 * time.Second
keepaliveTime = 30 * time.Second const keepaliveTimeout = 10 * time.Second
keepaliveTimeout = 10 * time.Second
// dialTimeout is the timeout for failing to establish a connection. // dialTimeout is the timeout for failing to establish a connection.
dialTimeout = 10 * time.Second // It is set to 20 seconds as times shorter than that will cause TLS connections to fail
) // on heavily loaded arm64 CPUs (issue #64649)
const dialTimeout = 20 * time.Second
func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) { func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
tlsInfo := transport.TLSInfo{ tlsInfo := transport.TLSInfo{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment