Use channel to propagate the stop info of sandbox

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

pkg/store/container/container.go

@@ -39,7 +39,7 @@ type Container struct {
 	// Container IO
 	IO *cio.ContainerIO
 	// StopCh is used to propagate the stop information of the container.
-	StopCh
+	store.StopCh
 }
 
 // Opts sets specific information to newly created Container.
@@ -80,7 +80,7 @@ func WithStatus(status Status, root string) Opts {
 func NewContainer(metadata Metadata, opts ...Opts) (Container, error) {
 	c := Container{
 		Metadata: metadata,
-		StopCh:   StopCh(make(chan struct{})),
+		StopCh:   store.StopCh(make(chan struct{})),
 	}
 	for _, o := range opts {
 		if err := o(&c); err != nil {
@@ -95,19 +95,6 @@ func (c *Container) Delete() error {
 	return c.Status.Delete()
 }
 
-// StopCh is used to propagate the stop information of a container.
-type StopCh chan struct{}
-
-// Stop close stopCh of the container.
-func (ch StopCh) Stop() {
-	close(ch)
-}
-
-// Stopped return the stopCh of the container as a readonly channel.
-func (ch StopCh) Stopped() <-chan struct{} {
-	return ch
-}
-
 // Store stores all Containers.
 type Store struct {
 	lock       sync.RWMutex

pkg/store/container/fake_status.go

@@ -22,6 +22,10 @@ import "sync"
 func WithFakeStatus(status Status) Opts {
 	return func(c *Container) error {
 		c.Status = &fakeStatusStorage{status: status}
+		if status.FinishedAt != 0 {
+			// Fake the TaskExit event
+			c.Stop()
+		}
 		return nil
 	}
 }

pkg/store/sandbox/sandbox.go

@@ -36,15 +36,22 @@ type Sandbox struct {
 	Container containerd.Container
 	// CNI network namespace client
 	NetNS *NetNS
+	// StopCh is used to propagate the stop information of the sandbox.
+	store.StopCh
 }
 
 // NewSandbox creates an internally used sandbox type. This functions reminds
 // the caller that a sandbox must have a status.
 func NewSandbox(metadata Metadata, status Status) Sandbox {
-	return Sandbox{
+	s := Sandbox{
 		Metadata: metadata,
 		Status:   StoreStatus(status),
+		StopCh:   store.StopCh(make(chan struct{})),
 	}
+	if status.State == StateNotReady {
+		s.Stop()
+	}
+	return s
 }
 
 // Store stores all sandboxes.

pkg/store/util.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package store
+
+// StopCh is used to propagate the stop information of a container.
+type StopCh chan struct{}
+
+// Stop close stopCh of the container.
+func (ch StopCh) Stop() {
+	close(ch)
+}
+
+// Stopped return the stopCh of the container as a readonly channel.
+func (ch StopCh) Stopped() <-chan struct{} {
+	return ch
+}