Timeout fixes

cmd/crictl/container.go

@@ -124,10 +124,10 @@ var createContainerCommand = &cli.Command{
 	Usage:     "Create a new container",
 	ArgsUsage: "POD container-config.[json|yaml] pod-config.[json|yaml]",
 	Flags:     append(createPullFlags, &cli.DurationFlag{
-		Name:    "timeout",
-		Aliases: []string{"t"},
+		Name:    "cancel-timeout",
+		Aliases: []string{"T"},
 		Value:   0,
-		Usage:   "Seconds to wait for a container create request before cancelling the request",
+		Usage:   "Seconds to wait for a container create request to complete before cancelling the request",
 	}),
 
 	Action: func(context *cli.Context) error {
@@ -167,7 +167,7 @@ var createContainerCommand = &cli.Command{
 					creds:    context.String("creds"),
 					auth:     context.String("auth"),
 				},
-				timeout: context.Duration("timeout"),
+				timeout: context.Duration("cancel-timeout"),
 			},
 		}
 

cmd/crictl/sandbox.go

@@ -53,10 +53,10 @@ var runPodCommand = &cli.Command{
 			Usage:   "Runtime handler to use. Available options are defined by the container runtime.",
 		},
 		&cli.DurationFlag{
-			Name:    "timeout",
-			Aliases: []string{"t"},
+			Name:    "cancel-timeout",
+			Aliases: []string{"T"},
 			Value:   0,
-			Usage:   "Seconds to wait for a run pod sandox request to complete before cancelling the request",
+			Usage:   "Seconds to wait for a run pod sandbox request to complete before cancelling the request",
 		},
 	},
 
@@ -78,7 +78,7 @@ var runPodCommand = &cli.Command{
 		}
 
 		// Test RuntimeServiceClient.RunPodSandbox
-		podID, err := RunPodSandbox(runtimeClient, podSandboxConfig, context.String("runtime"), context.Duration("timeout"))
+		podID, err := RunPodSandbox(runtimeClient, podSandboxConfig, context.String("runtime"), context.Duration("cancel-timeout"))
 		if err != nil {
 			return errors.Wrap(err, "run pod sandbox")
 		}

cmd/crictl/util.go

@@ -349,7 +349,7 @@ func ctxWithTimeout(timeout time.Duration) context.Context {
 	ctx, cancel := context.WithCancel(context.Background())
 	if timeout > 0 {
 		go func() {
-			time.Sleep(timeout * time.Second)
+			time.Sleep(timeout)
 			cancel()
 		}()
 	}