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

Merge pull request #691 from lifupan/wait_before_remove

Browse Source 
virtcontainers: wait until process exited before RemoveContainer
This commit is contained in:
Peng Tao
2018-09-04 13:16:16 +08:00
committed by GitHub
parent a39a3f15a3 a5478b93e0
commit 39ad9702de
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/container.go
View File

@@ -890,6 +890,12 @@ func (c *Container) stop() error {
// stopContainer() to succeed in such particular case. // stopContainer() to succeed in such particular case.
c.kill(syscall.SIGKILL, true) c.kill(syscall.SIGKILL, true)
// Since the agent has supported the MultiWaitProcess, it's better to
// wait the process here to make sure the process has exited before to
// issue stopContainer, otherwise the RemoveContainerRequest in it will
// get failed if the process hasn't exited.
c.sandbox.agent.waitProcess(c, c.id)
if err := c.sandbox.agent.stopContainer(c.sandbox, *c); err != nil { if err := c.sandbox.agent.stopContainer(c.sandbox, *c); err != nil {
return err return err
} }