Merge pull request GoogleCloudPlatform#148 from Jille/accept_errors

Gracefully handle Temporary errors from Accept()

Author: AthenaShi

cmd/cloud_sql_proxy/proxy.go

@@ -26,6 +26,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/logging"
 	"github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/fuse"
@@ -139,9 +140,17 @@ func listenInstance(dst chan<- proxy.Conn, cfg instanceConfig) (net.Listener, er
 
 	go func() {
 		for {
+			start := time.Now()
 			c, err := l.Accept()
 			if err != nil {
 				logging.Errorf("Error in accept for %q on %v: %v", cfg, cfg.Address, err)
+				if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
+					d := 10*time.Millisecond - time.Since(start)
+					if d > 0 {
+						time.Sleep(d)
+					}
+					continue
+				}
 				l.Close()
 				return
 			}

proxy/fuse/fuse.go

@@ -42,6 +42,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
@@ -281,9 +282,17 @@ func (r *fsRoot) removeListener(instance, path string) {
 // r.newConn is called. After the Listener returns an error it is removed.
 func (r *fsRoot) listenerLifecycle(l net.Listener, instance, path string) {
 	for {
+		start := time.Now()
 		c, err := l.Accept()
 		if err != nil {
 			logging.Errorf("error in Accept for %q: %v", instance, err)
+			if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
+				d := 10*time.Millisecond - time.Since(start)
+				if d > 0 {
+					time.Sleep(d)
+				}
+				continue
+			}
 			break
 		}
 		r.newConn(instance, c)

proxy/proxy/client.go

@@ -268,9 +268,17 @@ func NewConnSrc(instance string, l net.Listener) <-chan Conn {
 	ch := make(chan Conn)
 	go func() {
 		for {
+			start := time.Now()
 			c, err := l.Accept()
 			if err != nil {
 				logging.Errorf("listener (%#v) had error: %v", l, err)
+				if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
+					d := 10*time.Millisecond - time.Since(start)
+					if d > 0 {
+						time.Sleep(d)
+					}
+					continue
+				}
 				l.Close()
 				close(ch)
 				return