Merge pull request #940 from saschagrunert/timeout-execsync

k8s-ci-robot · web-flow · commit d9642f137ca8 · 2022-05-25T23:37:23.000-07:00
Fix timeout for exec sync
diff --git a/cmd/crictl/exec.go b/cmd/crictl/exec.go
@@ -110,7 +110,8 @@ func ExecSync(client internalapi.RuntimeService, opts execOptions) (int, error)
 		Timeout:     opts.timeout,
 	}
 	logrus.Debugf("ExecSyncRequest: %v", request)
-	stdout, stderr, err := client.ExecSync(opts.id, opts.cmd, time.Duration(opts.timeout))
+	timeoutDuration := time.Duration(opts.timeout) * time.Second
+	stdout, stderr, err := client.ExecSync(opts.id, opts.cmd, timeoutDuration)
 	if err != nil {
 		return 1, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ func ExecSync(client internalapi.RuntimeService, opts execOptions) (int, error)`
`110`	`110`	`Timeout: opts.timeout,`
`111`	`111`	`}`
`112`	`112`	`logrus.Debugf("ExecSyncRequest: %v", request)`
`113`		`- stdout, stderr, err := client.ExecSync(opts.id, opts.cmd, time.Duration(opts.timeout))`
	`113`	`+ timeoutDuration := time.Duration(opts.timeout) * time.Second`
	`114`	`+ stdout, stderr, err := client.ExecSync(opts.id, opts.cmd, timeoutDuration)`
`114`	`115`	`if err != nil {`
`115`	`116`	`return 1, err`
`116`	`117`	`}`