connect: retry proxy socket once for restarted client

hashicorp · Sep 19, 2019 · 53ab5f9 · 53ab5f9
1 parent 7f1e425
commit 53ab5f9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/client/allocrunner/consulsock_hook.go b/client/allocrunner/consulsock_hook.go
@@ -159,7 +159,12 @@ func (s *sockProxy) run(alloc *structs.Allocation) error {
 	hostGRPCSockPath := filepath.Join(s.allocDir.AllocDir, allocdir.AllocGRPCSocket)
 	listener, err := net.Listen("unix", hostGRPCSockPath)
 	if err != nil {
-		return fmt.Errorf("unable to create unix socket for Consul gRPC endpoint: %v", err)
+		os.Remove(hostGRPCSockPath)
+		listener, err = net.Listen("unix", hostGRPCSockPath)
+		if err != nil {
+			return fmt.Errorf(
+				"unable to create unix socket for Consul gRPC endpoint: %v", err)
+		}
 	}
 
 	// The gRPC socket should be usable by all users in case a task is