Skip to content

K
k3s
Commit ddab79a2 authored by Dan Williams's avatar Dan Williams
Browse files
Options

proxy/userspace: add proxy shutdown function and use in testcases

If a testcase does time out and 'go test' prints the call stack, make sure everything from previous tests is cleaned up so the call stack is easier to understand.
parent 4b07f80d
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 3 deletions
pkg/proxy/userspace/proxier.go
View file @ ddab79a2
...@@ -109,6 +109,8 @@ type Proxier struct { ...@@ -109,6 +109,8 @@ type Proxier struct {
proxyPorts PortAllocator proxyPorts PortAllocator
makeProxySocket ProxySocketFunc makeProxySocket ProxySocketFunc
exec utilexec.Interface exec utilexec.Interface
stopChan chan struct{}
} }
// assert Proxier is a ProxyProvider // assert Proxier is a ProxyProvider
...@@ -216,6 +218,7 @@ func createProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables ...@@ -216,6 +218,7 @@ func createProxier(loadBalancer LoadBalancer, listenIP net.IP, iptables iptables
proxyPorts: proxyPorts, proxyPorts: proxyPorts,
makeProxySocket: makeProxySocket, makeProxySocket: makeProxySocket,
exec: exec, exec: exec,
stopChan: make(chan struct{}),
}, nil }, nil
} }
...@@ -287,6 +290,20 @@ func CleanupLeftovers(ipt iptables.Interface) (encounteredError bool) { ...@@ -287,6 +290,20 @@ func CleanupLeftovers(ipt iptables.Interface) (encounteredError bool) {
return encounteredError return encounteredError
} }
// shutdown closes all service port proxies and returns from the proxy's
// sync loop. Used from testcases.
func (proxier *Proxier) shutdown() {
defer proxier.cleanupStaleStickySessions()
proxier.mu.Lock()
defer proxier.mu.Unlock()
for serviceName, info := range proxier.serviceMap {
proxier.stopProxyInternal(serviceName, info)
}
close(proxier.stopChan)
}
// Sync is called to immediately synchronize the proxier state to iptables // Sync is called to immediately synchronize the proxier state to iptables
func (proxier *Proxier) Sync() { func (proxier *Proxier) Sync() {
if err := iptablesInit(proxier.iptables); err != nil { if err := iptablesInit(proxier.iptables); err != nil {
...@@ -301,9 +318,13 @@ func (proxier *Proxier) SyncLoop() { ...@@ -301,9 +318,13 @@ func (proxier *Proxier) SyncLoop() {
t := time.NewTicker(proxier.syncPeriod) t := time.NewTicker(proxier.syncPeriod)
defer t.Stop() defer t.Stop()
for { for {
<-t.C select {
klog.V(6).Infof("Periodic sync") case <-t.C:
proxier.Sync() klog.V(6).Infof("Periodic sync")
proxier.Sync()
case <-proxier.stopChan:
return
}
} }
} }
......
pkg/proxy/userspace/proxier_test.go
View file @ ddab79a2
...@@ -243,6 +243,7 @@ func TestTCPProxy(t *testing.T) { ...@@ -243,6 +243,7 @@ func TestTCPProxy(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -270,6 +271,7 @@ func TestUDPProxy(t *testing.T) { ...@@ -270,6 +271,7 @@ func TestUDPProxy(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -297,6 +299,7 @@ func TestUDPProxyTimeout(t *testing.T) { ...@@ -297,6 +299,7 @@ func TestUDPProxyTimeout(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -336,6 +339,7 @@ func TestMultiPortProxy(t *testing.T) { ...@@ -336,6 +339,7 @@ func TestMultiPortProxy(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfoP, err := p.addServiceOnPort(serviceP, "TCP", 0, time.Second) svcInfoP, err := p.addServiceOnPort(serviceP, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -365,6 +369,7 @@ func TestMultiPortOnServiceAdd(t *testing.T) { ...@@ -365,6 +369,7 @@ func TestMultiPortOnServiceAdd(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
p.OnServiceAdd(&v1.Service{ p.OnServiceAdd(&v1.Service{
ObjectMeta: metav1.ObjectMeta{Name: serviceP.Name, Namespace: serviceP.Namespace}, ObjectMeta: metav1.ObjectMeta{Name: serviceP.Name, Namespace: serviceP.Namespace},
...@@ -428,6 +433,7 @@ func TestTCPProxyStop(t *testing.T) { ...@@ -428,6 +433,7 @@ func TestTCPProxyStop(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -472,6 +478,7 @@ func TestUDPProxyStop(t *testing.T) { ...@@ -472,6 +478,7 @@ func TestUDPProxyStop(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -510,6 +517,7 @@ func TestTCPProxyUpdateDelete(t *testing.T) { ...@@ -510,6 +517,7 @@ func TestTCPProxyUpdateDelete(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -554,6 +562,7 @@ func TestUDPProxyUpdateDelete(t *testing.T) { ...@@ -554,6 +562,7 @@ func TestUDPProxyUpdateDelete(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -599,6 +608,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) { ...@@ -599,6 +608,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -661,6 +671,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) { ...@@ -661,6 +671,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -722,6 +733,7 @@ func TestTCPProxyUpdatePort(t *testing.T) { ...@@ -722,6 +733,7 @@ func TestTCPProxyUpdatePort(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -770,6 +782,7 @@ func TestUDPProxyUpdatePort(t *testing.T) { ...@@ -770,6 +782,7 @@ func TestUDPProxyUpdatePort(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "UDP", 0, time.Second)
if err != nil { if err != nil {
...@@ -815,6 +828,7 @@ func TestProxyUpdatePublicIPs(t *testing.T) { ...@@ -815,6 +828,7 @@ func TestProxyUpdatePublicIPs(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
...@@ -868,6 +882,7 @@ func TestProxyUpdatePortal(t *testing.T) { ...@@ -868,6 +882,7 @@ func TestProxyUpdatePortal(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
waitForNumProxyLoops(t, p, 0) waitForNumProxyLoops(t, p, 0)
defer p.shutdown()
svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second) svcInfo, err := p.addServiceOnPort(service, "TCP", 0, time.Second)
if err != nil { if err != nil {
......
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