github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: rename closeAllConns to onHeartbeatFailure

Browse Source 
Since the behavior of the kubelet OnHeartbeatFailure hook has changed
to close only the idle connections, rename this function to match
the semantics.
This commit is contained in:
Antonio Ojea 2022-02-18 11:00:51 +01:00
parent ac22287051
commit 39e9b19b88
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/kubelet/app/server.go
View File

@ -554,14 +554,14 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
klog.InfoS("Standalone mode, no API client") klog.InfoS("Standalone mode, no API client")
case kubeDeps.KubeClient == nil, kubeDeps.EventClient == nil, kubeDeps.HeartbeatClient == nil: case kubeDeps.KubeClient == nil, kubeDeps.EventClient == nil, kubeDeps.HeartbeatClient == nil:
clientConfig, closeAllConns, err := buildKubeletClientConfig(ctx, s, nodeName) clientConfig, onHeartbeatFailure, err := buildKubeletClientConfig(ctx, s, nodeName)
if err != nil { if err != nil {
return err return err
} }
if closeAllConns == nil { if onHeartbeatFailure == nil {
return errors.New("closeAllConns must be a valid function other than nil") return errors.New("onHeartbeatFailure must be a valid function other than nil")
} }
kubeDeps.OnHeartbeatFailure = closeAllConns kubeDeps.OnHeartbeatFailure = onHeartbeatFailure
kubeDeps.KubeClient, err = clientset.NewForConfig(clientConfig) kubeDeps.KubeClient, err = clientset.NewForConfig(clientConfig)
if err != nil { if err != nil {
@ -845,6 +845,7 @@ func buildKubeletClientConfig(ctx context.Context, s *options.KubeletServer, nod
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
var onHeartbeatFailure func()
// Kubelet needs to be able to recover from stale http connections. // Kubelet needs to be able to recover from stale http connections.
// HTTP2 has a mechanism to detect broken connections by sending periodical pings. // HTTP2 has a mechanism to detect broken connections by sending periodical pings.
// HTTP1 only can have one persistent connection, and it will close all Idle connections // HTTP1 only can have one persistent connection, and it will close all Idle connections
@ -853,14 +854,15 @@ func buildKubeletClientConfig(ctx context.Context, s *options.KubeletServer, nod
// setting the environment variable DISABLE_HTTP2. // setting the environment variable DISABLE_HTTP2.
if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 { if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
klog.InfoS("HTTP2 has been explicitly disabled, Kubelet will forcefully close active connections on heartbeat failures") klog.InfoS("HTTP2 has been explicitly disabled, Kubelet will forcefully close active connections on heartbeat failures")
onHeartbeatFailure = closeAllConns
} else { } else {
closeAllConns = func() { utilnet.CloseIdleConnectionsFor(transportConfig.Transport) } onHeartbeatFailure = func() { utilnet.CloseIdleConnectionsFor(transportConfig.Transport) }
} }
klog.V(2).InfoS("Starting client certificate rotation") klog.V(2).InfoS("Starting client certificate rotation")
clientCertificateManager.Start() clientCertificateManager.Start()
return transportConfig, closeAllConns, nil return transportConfig, onHeartbeatFailure, nil
} }
if len(s.BootstrapKubeconfig) > 0 { if len(s.BootstrapKubeconfig) > 0 {
@ -884,19 +886,19 @@ func buildKubeletClientConfig(ctx context.Context, s *options.KubeletServer, nod
// once the Kubelet heartbeat fails. However, since there are many edge cases that we can't // once the Kubelet heartbeat fails. However, since there are many edge cases that we can't
// control, users can still opt-in to the previous behavior for closing the connections by // control, users can still opt-in to the previous behavior for closing the connections by
// setting the environment variable DISABLE_HTTP2. // setting the environment variable DISABLE_HTTP2.
var closeAllConns func() var onHeartbeatFailure func()
if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 { if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
klog.InfoS("HTTP2 has been explicitly disabled, updating Kubelet client Dialer to forcefully close active connections on heartbeat failures") klog.InfoS("HTTP2 has been explicitly disabled, updating Kubelet client Dialer to forcefully close active connections on heartbeat failures")
closeAllConns, err = updateDialer(clientConfig) onHeartbeatFailure, err = updateDialer(clientConfig)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
} else { } else {
closeAllConns = func() { onHeartbeatFailure = func() {
utilnet.CloseIdleConnectionsFor(clientConfig.Transport) utilnet.CloseIdleConnectionsFor(clientConfig.Transport)
} }
} }
return clientConfig, closeAllConns, nil return clientConfig, onHeartbeatFailure, nil
} }
// updateDialer instruments a restconfig with a dial. the returned function allows forcefully closing all active connections. // updateDialer instruments a restconfig with a dial. the returned function allows forcefully closing all active connections.