github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Do not checkpoint sandbox pid.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2017-08-25 01:37:55 +00:00
parent e559804b37
commit 60d8430ac1
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/server/sandbox_portforward.go
View File

@@ -40,7 +40,7 @@ func (c *criContainerdService) PortForward(ctx context.Context, r *runtime.PortF
t, err := sandbox.Container.Task(ctx, nil)
if err != nil {
return nil, fmt.Errorf("failed to get sandbox container: %v", err)
return nil, fmt.Errorf("failed to get sandbox container task: %v", err)
}
status, err := t.Status(ctx)
if err != nil {
@@ -61,7 +61,11 @@ func (c *criContainerdService) portForward(id string, port int32, stream io.Read
if err != nil {
return fmt.Errorf("failed to find sandbox in store: %v", err)
}
pid := s.Pid
t, err := s.Container.Task(context.Background(), nil)
if err != nil {
return fmt.Errorf("failed to get sandbox container task: %v", err)
}
pid := t.Pid()
socat, err := exec.LookPath("socat")
if err != nil {