Unify dialer implementations

vladimiroff · vladimiroff · commit 4dd75be2b93d · 2020-02-26T23:29:04.000+02:00
Instead of having several dialer implementations, leave only one in `pkg/dialer` and call it from `pkg/ttrpcutil`, `runtime/v(1|2)/shim` which had their own Closes containerd#3471. Signed-off-by: Kiril Vladimiroff <kiril@vladimiroff.org>
diff --git a/pkg/dialer/dialer_windows.go b/pkg/dialer/dialer_windows.go
@@ -19,21 +19,13 @@ package dialer
 import (
 	"net"
 	"os"
-	"syscall"
 	"time"
 
 	winio "github.com/Microsoft/go-winio"
 )
 
 func isNoent(err error) bool {
-	if err != nil {
-		if oerr, ok := err.(*os.PathError); ok {
-			if oerr.Err == syscall.ENOENT {
-				return true
-			}
-		}
-	}
-	return false
+	return os.IsNotExist(err)
 }
 
 func dialer(address string, timeout time.Duration) (net.Conn, error) {
diff --git a/pkg/ttrpcutil/client.go b/pkg/ttrpcutil/client.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
+	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/containerd/ttrpc"
 	"github.com/pkg/errors"
 )
@@ -40,7 +41,7 @@ type Client struct {
 // NewClient returns a new containerd TTRPC client that is connected to the containerd instance provided by address
 func NewClient(address string, opts ...ttrpc.ClientOpts) (*Client, error) {
 	connector := func() (*ttrpc.Client, error) {
-		conn, err := ttrpcDial(address, ttrpcDialTimeout)
+		conn, err := dialer.Dialer(address, ttrpcDialTimeout)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to connect")
 		}
diff --git a/pkg/ttrpcutil/client_unix.go b/pkg/ttrpcutil/client_unix.go
diff --git a/pkg/ttrpcutil/client_windows.go b/pkg/ttrpcutil/client_windows.go
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
@@ -40,6 +40,7 @@ import (
 
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/log"
+	"github.com/containerd/containerd/pkg/dialer"
 	v1 "github.com/containerd/containerd/runtime/v1"
 	"github.com/containerd/containerd/runtime/v1/shim"
 	shimapi "github.com/containerd/containerd/runtime/v1/shim/v1"
@@ -228,7 +229,7 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (n
 
 func annonDialer(address string, timeout time.Duration) (net.Conn, error) {
 	address = strings.TrimPrefix(address, "unix://")
-	return net.DialTimeout("unix", "\x00"+address, timeout)
+	return dialer.Dialer("\x00"+address, timeout)
 }
 
 // WithConnect connects to an existing shim
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
@@ -30,6 +30,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/containerd/containerd/sys"
 	"github.com/pkg/errors"
 )
@@ -75,7 +76,7 @@ func SocketAddress(ctx context.Context, id string) (string, error) {
 // AnonDialer returns a dialer for an abstract socket
 func AnonDialer(address string, timeout time.Duration) (net.Conn, error) {
 	address = strings.TrimPrefix(address, "unix://")
-	return net.DialTimeout("unix", "\x00"+address, timeout)
+	return dialer.Dialer("\x00"+address, timeout)
 }
 
 func AnonReconnectDialer(address string, timeout time.Duration) (net.Conn, error) {

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`	`"time"`
`31`	`31`
`32`	`32`	`"github.com/containerd/containerd/namespaces"`
	`33`	`+ "github.com/containerd/containerd/pkg/dialer"`
`33`	`34`	`"github.com/containerd/containerd/sys"`
`34`	`35`	`"github.com/pkg/errors"`
`35`	`36`	`)`
`@@ -75,7 +76,7 @@ func SocketAddress(ctx context.Context, id string) (string, error) {`
`75`	`76`	`// AnonDialer returns a dialer for an abstract socket`
`76`	`77`	`func AnonDialer(address string, timeout time.Duration) (net.Conn, error) {`
`77`	`78`	`address = strings.TrimPrefix(address, "unix://")`
`78`		`- return net.DialTimeout("unix", "\x00"+address, timeout)`
	`79`	`+ return dialer.Dialer("\x00"+address, timeout)`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`func AnonReconnectDialer(address string, timeout time.Duration) (net.Conn, error) {`