shimv2: cancel monitor before stopping sandbox

So that we don't trigger sandbox watcher on our own. Signed-off-by: Peng Tao <[email protected]>
kata-containers · Aug 16, 2019 · 5b50b34 · 5b50b34
1 parent 49184ee
commit 5b50b34
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/containerd-shim-v2/wait.go b/containerd-shim-v2/wait.go
@@ -53,6 +53,10 @@ func wait(s *service, c *container, execID string) (int32, error) {
 		// sandbox.
 
 		if c.cType.IsSandbox() {
+			// cancel watcher
+			if s.monitor != nil {
+				s.monitor <- nil
+			}
 			if err = s.sandbox.Stop(true); err != nil {
 				logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to stop sandbox")
 			}