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

Add retries to conntracker.ListEntries()

Browse Source 
Signed-off-by: Daman Arora <aroradaman@gmail.com>
This commit is contained in:
Adrian Moisey 2025-01-30 20:09:15 +02:00
parent 2b3da7dfc8
commit 90a42e0dc0
No known key found for this signature in database
GPG Key ID: 41AE4AE32747C7CF
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/proxy/conntrack/cleanup.go
View File

@ -20,6 +20,7 @@ limitations under the License.
package conntrack
import (
"errors"
"time"
"github.com/vishvananda/netlink"
@ -43,8 +44,12 @@ func CleanStaleEntries(ct Interface, ipFamily v1.IPFamily,
entries, err := ct.ListEntries(ipFamilyMap[ipFamily])
if err != nil {
klog.ErrorS(err, "Failed to list conntrack entries")
return
if errors.Is(err, unix.EINTR) {
klog.V(2).ErrorS(err, "received a partial result, continuing to clean with partial result")
} else {
klog.ErrorS(err, "Failed to list conntrack entries")
return
}
}
// serviceIPEndpointIPs maps service IPs (ClusterIP, LoadBalancerIPs and ExternalIPs)

10
pkg/proxy/conntrack/conntrack.go
View File

@ -24,7 +24,9 @@ import (
"github.com/vishvananda/netlink"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/proxy/util"
)
// Interface for dealing with conntrack
@ -57,8 +59,12 @@ func newConntracker(handler netlinkHandler) Interface {
}
// ListEntries list all conntrack entries for connections of the given IP family.
func (ct *conntracker) ListEntries(ipFamily uint8) ([]*netlink.ConntrackFlow, error) {
return ct.handler.ConntrackTableList(netlink.ConntrackTable, netlink.InetFamily(ipFamily))
func (ct *conntracker) ListEntries(ipFamily uint8) (entries []*netlink.ConntrackFlow, err error) {
err = retry.OnError(util.MaxAttemptsEINTR, util.ShouldRetryOnEINTR, func() error {
entries, err = ct.handler.ConntrackTableList(netlink.ConntrackTable, netlink.InetFamily(ipFamily))
return err
})
return entries, err
}
// ClearEntries deletes conntrack entries for connections of the given IP family,

31
pkg/proxy/util/utils_linux.go Normal file
View File

@ -0,0 +1,31 @@
//go:build linux
// +build linux
/*
Copyright 2025 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package util
import (
"errors"
"golang.org/x/sys/unix"
"k8s.io/apimachinery/pkg/util/wait"
)
var MaxAttemptsEINTR = wait.Backoff{Steps: 5}
var ShouldRetryOnEINTR = func(err error) bool { return errors.Is(err, unix.EINTR) }