Skip to content
Permalink
Browse files

Merge pull request #79044 from andrewsykim/automated-cherry-pick-of-#…

…78999-origin-release-1.15

Automated cherry pick of #78999: ipvs: fix string check for IPVS protocol during graceful
  • Loading branch information...
k8s-ci-robot committed Jun 15, 2019
2 parents d0813a2 + 917b434 commit e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkg/proxy/ipvs/graceful_termination.go
@@ -18,6 +18,7 @@ package ipvs

import (
"fmt"
"strings"
"sync"
"time"

@@ -167,7 +168,7 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e
// For UDP traffic, no graceful termination, we immediately delete the RS
// (existing connections will be deleted on the next packet because sysctlExpireNoDestConn=1)
// For other protocols, don't delete until all connections have expired)
if rsToDelete.VirtualServer.Protocol != "udp" && rs.ActiveConn+rs.InactiveConn != 0 {
if strings.ToUpper(rsToDelete.VirtualServer.Protocol) != "UDP" && rs.ActiveConn+rs.InactiveConn != 0 {
klog.Infof("Not deleting, RS %v: %v ActiveConn, %v InactiveConn", rsToDelete.String(), rs.ActiveConn, rs.InactiveConn)
return false, nil
}

0 comments on commit e8462b5

Please sign in to comment.
You can’t perform that action at this time.