github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-14 07:34:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2122 from darfux/v2_pause_resume_behavior

Browse Source 
v2: Change the event and error behavior of pause/resume
This commit is contained in:
Peng Tao 2019-10-10 16:52:09 +08:00 committed by GitHub
commit 729b5faf52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
containerd-shim-v2/service.go
View File

@ -592,17 +592,17 @@ func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (_ *ptypes
err = s.sandbox.PauseContainer(r.ID) err = s.sandbox.PauseContainer(r.ID)
if err == nil { if err == nil {
c.status = task.StatusPaused c.status = task.StatusPaused
return empty, nil
}
c.status, err = s.getContainerStatus(c.id)
if err != nil {
c.status = task.StatusUnknown
}
s.send(&eventstypes.TaskPaused{ s.send(&eventstypes.TaskPaused{
ContainerID: c.id, ContainerID: c.id,
}) })
return empty, nil
}
if status, err := s.getContainerStatus(c.id); err != nil {
c.status = task.StatusUnknown
} else {
c.status = status
}
return empty, err return empty, err
} }
@ -624,17 +624,17 @@ func (s *service) Resume(ctx context.Context, r *taskAPI.ResumeRequest) (_ *ptyp
err = s.sandbox.ResumeContainer(c.id) err = s.sandbox.ResumeContainer(c.id)
if err == nil { if err == nil {
c.status = task.StatusRunning c.status = task.StatusRunning
return empty, nil
}
c.status, err = s.getContainerStatus(c.id)
if err != nil {
c.status = task.StatusUnknown
}
s.send(&eventstypes.TaskResumed{ s.send(&eventstypes.TaskResumed{
ContainerID: c.id, ContainerID: c.id,
}) })
return empty, nil
}
if status, err := s.getContainerStatus(c.id); err != nil {
c.status = task.StatusUnknown
} else {
c.status = status
}
return empty, err return empty, err
} }