github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1314 from ddysher/fd-lead

Browse Source 
Fix leaking FD
This commit is contained in:
Tim Hockin 2014-09-15 17:24:29 -07:00
commit f8a8df369c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/proxy/proxier.go
View File

@ -109,16 +109,21 @@ func (tcp *tcpProxySocket) ProxyLoop(service string, proxier *Proxier) {
continue continue
} }
// Spin up an async copy loop. // Spin up an async copy loop.
proxyTCP(inConn.(*net.TCPConn), outConn.(*net.TCPConn)) go proxyTCP(inConn.(*net.TCPConn), outConn.(*net.TCPConn))
} }
} }
// proxyTCP proxies data bi-directionally between in and out. // proxyTCP proxies data bi-directionally between in and out.
func proxyTCP(in, out *net.TCPConn) { func proxyTCP(in, out *net.TCPConn) {
var wg sync.WaitGroup
wg.Add(2)
glog.Infof("Creating proxy between %v <-> %v <-> %v <-> %v", glog.Infof("Creating proxy between %v <-> %v <-> %v <-> %v",
in.RemoteAddr(), in.LocalAddr(), out.LocalAddr(), out.RemoteAddr()) in.RemoteAddr(), in.LocalAddr(), out.LocalAddr(), out.RemoteAddr())
go copyBytes(in, out) go copyBytes(in, out, &wg)
go copyBytes(out, in) go copyBytes(out, in, &wg)
wg.Wait()
in.Close()
out.Close()
} }
// udpProxySocket implements proxySocket. Close() is implemented by net.UDPConn. When Close() is called, // udpProxySocket implements proxySocket. Close() is implemented by net.UDPConn. When Close() is called,
@ -302,7 +307,8 @@ func NewProxier(loadBalancer LoadBalancer, address string) *Proxier {
} }
} }
func copyBytes(in, out *net.TCPConn) { func copyBytes(in, out *net.TCPConn, wg *sync.WaitGroup) {
defer wg.Done()
glog.Infof("Copying from %v <-> %v <-> %v <-> %v", glog.Infof("Copying from %v <-> %v <-> %v <-> %v",
in.RemoteAddr(), in.LocalAddr(), out.LocalAddr(), out.RemoteAddr()) in.RemoteAddr(), in.LocalAddr(), out.LocalAddr(), out.RemoteAddr())
if _, err := io.Copy(in, out); err != nil { if _, err := io.Copy(in, out); err != nil {