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

Merge pull request #71515 from DataDog/lbernail/udp-graceful

Browse Source 
Enable graceful termination for UDP flows when using kube-proxy in IPVS mode
This commit is contained in:
k8s-ci-robot 2018-11-30 01:20:27 -08:00 committed by GitHub
commit 25c9ac6544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/proxy/ipvs/graceful_termination.go
View File

@ -75,10 +75,10 @@ func (q *graceTerminateRSList) remove(rs *listItem) bool {
uniqueRS := rs.String() uniqueRS := rs.String()
if _, ok := q.list[uniqueRS]; ok { if _, ok := q.list[uniqueRS]; ok {
return false delete(q.list, uniqueRS)
return true
} }
delete(q.list, uniqueRS) return false
return true
} }
func (q *graceTerminateRSList) flushList(handler func(rsToDelete *listItem) (bool, error)) bool { func (q *graceTerminateRSList) flushList(handler func(rsToDelete *listItem) (bool, error)) bool {
@ -164,7 +164,10 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e
} }
for _, rs := range rss { for _, rs := range rss {
if rsToDelete.RealServer.Equal(rs) { if rsToDelete.RealServer.Equal(rs) {
if rs.ActiveConn != 0 { // Delete RS with no connections
// For UDP, ActiveConn is always 0
// For TCP, InactiveConn are connections not in ESTABLISHED state
if rs.ActiveConn+rs.InactiveConn != 0 {
return false, nil return false, nil
} }
klog.Infof("Deleting rs: %s", rsToDelete.String()) klog.Infof("Deleting rs: %s", rsToDelete.String())

2
pkg/proxy/ipvs/proxier.go
View File

@ -1602,7 +1602,7 @@ func (proxier *Proxier) syncEndpoint(svcPortName proxy.ServicePortName, onlyNode
Port: uint16(portNum), Port: uint16(portNum),
} }
klog.V(5).Infof("Using graceful delete to delete: %v", delDest) klog.V(5).Infof("Using graceful delete to delete: %v", uniqueRS)
err = proxier.gracefuldeleteManager.GracefulDeleteRS(appliedVirtualServer, delDest) err = proxier.gracefuldeleteManager.GracefulDeleteRS(appliedVirtualServer, delDest)
if err != nil { if err != nil {
klog.Errorf("Failed to delete destination: %v, error: %v", delDest, err) klog.Errorf("Failed to delete destination: %v, error: %v", delDest, err)