Merge pull request #144 from resouer/fix-timeout

feiskyer · web-flow · commit c7135ec773d9 · 2016-09-22T11:52:48.000+08:00
Fix timeout when exec/attach
diff --git a/examples/hypernetes-demo.sh b/examples/hypernetes-demo.sh
@@ -68,6 +68,8 @@ spec:
   containers:
   - name: busybox
     image: busybox
+    command:
+    - "top"
 EOF
 }
 
diff --git a/pkg/kubelet/hyper/hyperclient.go b/pkg/kubelet/hyper/hyperclient.go
@@ -413,7 +413,7 @@ func (c *HyperClient) Attach(opts AttachToContainerOptions) error {
 		return fmt.Errorf("No Such Container %s", opts.Container)
 	}
 
-	ctx, cancel := getContextWithTimeout(hyperContextTimeout)
+	ctx, cancel := getContextWithCancel()
 	defer cancel()
 
 	stream, err := c.client.Attach(ctx)
@@ -499,7 +499,7 @@ func (c *HyperClient) Exec(opts ExecInContainerOptions) error {
 		Tty:         opts.TTY,
 	}
 
-	ctx, cancel := getContextWithTimeout(hyperContextTimeout)
+	ctx, cancel := getContextWithCancel()
 	defer cancel()
 
 	createResponse, err := c.client.ExecCreate(ctx, &createRequest)

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ func (c *HyperClient) Attach(opts AttachToContainerOptions) error {`
`413`	`413`	`return fmt.Errorf("No Such Container %s", opts.Container)`
`414`	`414`	`}`
`415`	`415`
`416`		`- ctx, cancel := getContextWithTimeout(hyperContextTimeout)`
	`416`	`+ ctx, cancel := getContextWithCancel()`
`417`	`417`	`defer cancel()`
`418`	`418`
`419`	`419`	`stream, err := c.client.Attach(ctx)`
`@@ -499,7 +499,7 @@ func (c *HyperClient) Exec(opts ExecInContainerOptions) error {`
`499`	`499`	`Tty: opts.TTY,`
`500`	`500`	`}`
`501`	`501`
`502`		`- ctx, cancel := getContextWithTimeout(hyperContextTimeout)`
	`502`	`+ ctx, cancel := getContextWithCancel()`
`503`	`503`	`defer cancel()`
`504`	`504`
`505`	`505`	`createResponse, err := c.client.ExecCreate(ctx, &createRequest)`