github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 11:44:44 +00:00
Code Issues Projects Releases Wiki Activity

[vsudd] Don't retry when dockerd is not running

Browse Source 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
This commit is contained in:
Simon Ferquel 2016-11-21 06:24:30 -05:00
parent 228acc91f5
commit a12a833b20
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
alpine/packages/vsudd/main.go
View File

@ -12,7 +12,6 @@ import (
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
"time"
"github.com/rneugeba/virtsock/go/hvsock" "github.com/rneugeba/virtsock/go/hvsock"
"github.com/rneugeba/virtsock/go/vsock" "github.com/rneugeba/virtsock/go/vsock"
@ -189,17 +188,11 @@ func handleOneIn(connid int, conn vConn, sock string) {
var docker *net.UnixConn var docker *net.UnixConn
var err error var err error
// Cope with the server socket appearing up to 10s later docker, err = net.DialUnix("unix", nil, &net.UnixAddr{sock, "unix"})
for i := 0; i < 200; i++ {
docker, err = net.DialUnix("unix", nil, &net.UnixAddr{sock, "unix"})
if err == nil {
break
}
time.Sleep(50 * time.Millisecond)
}
if err != nil { if err != nil {
// If the forwarding program has broken then close and continue // If the forwarding program has broken then close and continue
log.Println(connid, "Failed to connect to Unix domain socket after 10s", sock, err) log.Println(connid, "Failed to connect to Unix domain socket", sock, err)
return return
} }
defer func() { defer func() {