fix(windows): create debug npipe failure

thxCode · thxCode · commit 2de38a926965 · 2021-04-14T17:32:54.000+08:00
Signed-off-by: Weijia Mai &lt;thxcode0824@gmail.com&gt;
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -190,7 +190,7 @@ can be used and modified as necessary as a custom configuration.`
 
 		if config.Debug.Address != "" {
 			var l net.Listener
-			if filepath.IsAbs(config.Debug.Address) {
+			if isLocalAddress(config.Debug.Address) {
 				if l, err = sys.GetLocalListener(config.Debug.Address, config.Debug.UID, config.Debug.GID); err != nil {
 					return errors.Wrapf(err, "failed to get listener for debug endpoint")
 				}
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -21,6 +21,7 @@ package command
 import (
 	"context"
 	"os"
+	"path/filepath"
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/services/server"
@@ -72,3 +73,7 @@ func handleSignals(ctx context.Context, signals chan os.Signal, serverC chan *se
 	}()
 	return done
 }
+
+func isLocalAddress(path string) bool {
+	return filepath.IsAbs(path)
+}
diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 	"unsafe"
 
 	"github.com/Microsoft/go-winio/pkg/etw"
@@ -117,3 +118,7 @@ func init() {
 		}
 	}
 }
+
+func isLocalAddress(path string) bool {
+	return strings.HasPrefix(path, `\\.\pipe\`)
+}

Original file line number	Diff line number	Diff line change
@@ -190,7 +190,7 @@ can be used and modified as necessary as a custom configuration.`
`190`	`190`
`191`	`191`	`if config.Debug.Address != "" {`
`192`	`192`	`var l net.Listener`
`193`		`- if filepath.IsAbs(config.Debug.Address) {`
	`193`	`+ if isLocalAddress(config.Debug.Address) {`
`194`	`194`	`if l, err = sys.GetLocalListener(config.Debug.Address, config.Debug.UID, config.Debug.GID); err != nil {`
`195`	`195`	`return errors.Wrapf(err, "failed to get listener for debug endpoint")`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"fmt"`
`22`	`22`	`"os"`
	`23`	`+ "strings"`
`23`	`24`	`"unsafe"`
`24`	`25`
`25`	`26`	`"github.com/Microsoft/go-winio/pkg/etw"`
`@@ -117,3 +118,7 @@ func init() {`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`	`}`
	`121`	`+`
	`122`	`+func isLocalAddress(path string) bool {`
	`123`	+ return strings.HasPrefix(path, `\\.\pipe\`)
	`124`	`+}`