shim: fix debug flag not working

wllenyj · cpuguy83 · commit 28f1e32e3b1b · 2023-03-19T14:38:55.000Z
As we know, shim starts twice. The first time we execute the shim with the `start` arguments, the `-debug` argument is passed to the shim process correctly. But the second time we execute shim, the debug flag is ignored. Signed-off-by: wllenyj <wllenyj@linux.alibaba.com> (cherry picked from commit f710505) Signed-off-by: Brian Goff <cpuguy83@gmail.com>
diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go
@@ -69,7 +69,7 @@ type manager struct {
 	name string
 }
 
-func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (*exec.Cmd, error) {
+func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string, debug bool) (*exec.Cmd, error) {
 	ns, err := namespaces.NamespaceRequired(ctx)
 	if err != nil {
 		return nil, err
@@ -87,6 +87,9 @@ func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, co
 		"-id", id,
 		"-address", containerdAddress,
 	}
+	if debug {
+		args = append(args, "-debug")
+	}
 	cmd := exec.Command(self, args...)
 	cmd.Dir = cwd
 	cmd.Env = append(os.Environ(), "GOMAXPROCS=4")
@@ -114,7 +117,7 @@ func (m manager) Name() string {
 }
 
 func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ string, retErr error) {
-	cmd, err := newCommand(ctx, id, opts.ContainerdBinary, opts.Address, opts.TTRPCAddress)
+	cmd, err := newCommand(ctx, id, opts.ContainerdBinary, opts.Address, opts.TTRPCAddress, opts.Debug)
 	if err != nil {
 		return "", err
 	}
diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
@@ -52,6 +52,7 @@ type StartOpts struct {
 	ContainerdBinary string
 	Address          string
 	TTRPCAddress     string
+	Debug            bool
 }
 
 type StopStatus struct {
@@ -333,6 +334,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
 			ContainerdBinary: containerdBinaryFlag,
 			Address:          addressFlag,
 			TTRPCAddress:     ttrpcAddress,
+			Debug:            debugFlag,
 		}
 
 		address, err := manager.Start(ctx, id, opts)

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ type manager struct {`
`69`	`69`	`name string`
`70`	`70`	`}`
`71`	`71`
`72`		`-func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (*exec.Cmd, error) {`
	`72`	`+func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string, debug bool) (*exec.Cmd, error) {`
`73`	`73`	`ns, err := namespaces.NamespaceRequired(ctx)`
`74`	`74`	`if err != nil {`
`75`	`75`	`return nil, err`
`@@ -87,6 +87,9 @@ func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, co`
`87`	`87`	`"-id", id,`
`88`	`88`	`"-address", containerdAddress,`
`89`	`89`	`}`
	`90`	`+ if debug {`
	`91`	`+ args = append(args, "-debug")`
	`92`	`+ }`
`90`	`93`	`cmd := exec.Command(self, args...)`
`91`	`94`	`cmd.Dir = cwd`
`92`	`95`	`cmd.Env = append(os.Environ(), "GOMAXPROCS=4")`
`@@ -114,7 +117,7 @@ func (m manager) Name() string {`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`func (manager) Start(ctx context.Context, id string, opts shim.StartOpts) (_ string, retErr error) {`
`117`		`- cmd, err := newCommand(ctx, id, opts.ContainerdBinary, opts.Address, opts.TTRPCAddress)`
	`120`	`+ cmd, err := newCommand(ctx, id, opts.ContainerdBinary, opts.Address, opts.TTRPCAddress, opts.Debug)`
`118`	`121`	`if err != nil {`
`119`	`122`	`return "", err`
`120`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ type StartOpts struct {`
`52`	`52`	`ContainerdBinary string`
`53`	`53`	`Address string`
`54`	`54`	`TTRPCAddress string`
	`55`	`+ Debug bool`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`type StopStatus struct {`
`@@ -333,6 +334,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi`
`333`	`334`	`ContainerdBinary: containerdBinaryFlag,`
`334`	`335`	`Address: addressFlag,`
`335`	`336`	`TTRPCAddress: ttrpcAddress,`
	`337`	`+ Debug: debugFlag,`
`336`	`338`	`}`
`337`	`339`
`338`	`340`	`address, err := manager.Start(ctx, id, opts)`