Merge pull request #5800 from zhuangqh/binarycall-timeout

mxpv · web-flow · commit 742ffadfbd8d · 2021-07-27T09:59:56.000-07:00
respect context timeout in shim binary call
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -100,7 +100,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd
 		}
 	}
 
-	cmd := exec.Command(cmdPath, args...)
+	cmd := exec.CommandContext(ctx, cmdPath, args...)
 	cmd.Dir = path
 	cmd.Env = append(
 		os.Environ(),

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`- cmd := exec.Command(cmdPath, args...)`
	`103`	`+ cmd := exec.CommandContext(ctx, cmdPath, args...)`
`104`	`104`	`cmd.Dir = path`
`105`	`105`	`cmd.Env = append(`
`106`	`106`	`os.Environ(),`