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

Fixes containerd-shim-runhcs State on exec id

Browse Source 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
This commit is contained in:
Justin Terry (VM) 2018-09-26 13:57:15 -07:00
parent 83437ef646
commit 772644e978
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/v2/runhcs/service.go
View File

@ -204,14 +204,26 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
return nil, err return nil, err
} }
var tstatus string
// This is a container
if p.cid == p.id {
rhcs := newRunhcs(p.bundle) rhcs := newRunhcs(p.bundle)
cs, err := rhcs.State(ctx, p.id) cs, err := rhcs.State(ctx, p.id)
if err != nil { if err != nil {
return nil, err return nil, err
} }
tstatus = cs.Status
} else {
if p.started {
tstatus = "running"
} else {
tstatus = "created"
}
}
status := task.StatusUnknown status := task.StatusUnknown
switch cs.Status { switch tstatus {
case "created": case "created":
status = task.StatusCreated status = task.StatusCreated
case "running": case "running":
@ -224,8 +236,8 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
pe := p.stat() pe := p.stat()
return &taskAPI.StateResponse{ return &taskAPI.StateResponse{
ID: p.id, ID: p.id,
Bundle: cs.Bundle, Bundle: p.bundle,
Pid: uint32(cs.InitProcessPid), Pid: p.pid,
Status: status, Status: status,
Stdin: p.stdin, Stdin: p.stdin,
Stdout: p.stdout, Stdout: p.stdout,