kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix lint

pull/8457/head
Priya Wadhwa 2020-06-11 13:00:44 -07:00
parent 330224f36a
commit b750ab4964
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/drivers/kic/oci/cli_runner.go
View File

@ -89,14 +89,15 @@ func runCmd(cmd *exec.Cmd, warnSlow ...bool) (*RunResult, error) {
killTime := 19 * time.Second // this will be applied only if warnSlow is true killTime := 19 * time.Second // this will be applied only if warnSlow is true
warnTime := 10 * time.Second warnTime := 10 * time.Second
ctx, cancel := context.WithTimeout(context.Background(), killTime)
defer cancel()
if cmd.Args[1] == "volume" || cmd.Args[1] == "ps" { // volume and ps requires more time than inspect if cmd.Args[1] == "volume" || cmd.Args[1] == "ps" { // volume and ps requires more time than inspect
killTime = 30 * time.Second killTime = 30 * time.Second
warnTime = 3 * time.Second warnTime = 3 * time.Second
} }
ctx, cancel := context.WithTimeout(context.Background(), killTime)
defer cancel()
if warn { // convert exec.Command to with context if warn { // convert exec.Command to with context
cmdWithCtx := exec.CommandContext(ctx, cmd.Args[0], cmd.Args[1:]...) cmdWithCtx := exec.CommandContext(ctx, cmd.Args[0], cmd.Args[1:]...)
cmdWithCtx.Stdout = cmd.Stdout //copying the original command cmdWithCtx.Stdout = cmd.Stdout //copying the original command