aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-24 16:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

shimv2: cancel monitor before stopping sandbox

Browse Source 
So that we don't trigger sandbox watcher on our own.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao
2019-08-13 03:37:49 -07:00
parent 49184ee562
commit 5b50b34df4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
containerd-shim-v2/wait.go
View File

@@ -53,6 +53,10 @@ func wait(s *service, c *container, execID string) (int32, error) {
// sandbox. // sandbox.
if c.cType.IsSandbox() { if c.cType.IsSandbox() {
// cancel watcher
if s.monitor != nil {
s.monitor <- nil
}
if err = s.sandbox.Stop(true); err != nil { if err = s.sandbox.Stop(true); err != nil {
logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to stop sandbox") logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to stop sandbox")
} }