Associate containers with sandbox

Signed-off-by: fupan <lifupan@gmail.com>

Author: lifupan

daemon/pod/container.go

@@ -943,6 +943,32 @@ func (c *Container) addToSandbox() error {
 	return nil
 }
 
+func (c *Container) associateToSandbox() error {
+	c.Log(DEBUG, "try to associate container %s to sandbox", c.Id())
+
+	containerStatus, err := c.p.sandbox.StatusContainer(c.Id())
+	if err != nil {
+		c.Log(ERROR, err)
+		return err
+	}
+
+	switch containerStatus.State.State {
+	case vc.StateRunning:
+		c.status.State = S_CONTAINER_RUNNING
+		c.status.StartedAt = containerStatus.StartTime
+
+	default:
+		c.status.State = S_CONTAINER_CREATED
+		c.status.CreatedAt = time.Now()
+	}
+
+	go c.waitFinish(-1)
+
+	c.startLogging()
+
+	return nil
+}
+
 // This method should be called when initialzing container or put into resource lock.
 func (c *Container) initStreams() error {
 	if c.streams != nil {

daemon/pod/persist.go

@@ -144,16 +144,15 @@ func LoadXPod(factory *PodFactory, layout *types.PersistPodLayout) (*XPod, error
 	if err != nil {
 		return nil, err
 	}
-	/*
-		//associate containers
-		if p.status == S_POD_RUNNING {
-			for _, c := range p.containers {
-				if err = c.associateToSandbox(); err != nil {
-					return nil, err
-				}
+
+	//associate containers
+	if p.status == S_POD_RUNNING {
+		for _, c := range p.containers {
+			if err = c.associateToSandbox(); err != nil {
+				return nil, err
 			}
 		}
-	*/
+	}
 
 	// don't need to reserve name again, because this is load
 	return p, nil
@@ -450,31 +449,31 @@ func (inf *Interface) removeFromDB() error {
 
 func (p *XPod) saveSandbox() error {
 
-		var (
-			sb  types.SandboxPersistInfo
-			err error
-		)
-		stop_status := map[PodState]bool{
-			S_POD_NONE:     true,
-			S_POD_STOPPED:  true,
-			S_POD_STOPPING: true,
-			S_POD_ERROR:    true,
+	var (
+		sb  types.SandboxPersistInfo
+		err error
+	)
+	stop_status := map[PodState]bool{
+		S_POD_NONE:     true,
+		S_POD_STOPPED:  true,
+		S_POD_STOPPING: true,
+		S_POD_ERROR:    true,
+	}
+	p.statusLock.RLock()
+	defer p.statusLock.RUnlock()
+	if !stop_status[p.status] {
+		sb.Id = p.sandbox.ID()
+		/*By now the sandbox info had been managed by kata, thus there is no need
+		*to keep those info here.
+		 */
+		sb.PersistInfo = nil
+		if err != nil {
+			hlog.HLog(ERROR, p, 2, "failed to dump sandbox %s: %v", sb.Id, err)
+			return err
 		}
-		p.statusLock.RLock()
-		defer p.statusLock.RUnlock()
-		if !stop_status[p.status] {
-			sb.Id = p.sandbox.ID()
-			/*By now the sandbox info had been managed by kata, thus there is no need
-			*to keep those info here.
-			*/
-			sb.PersistInfo = nil
-			if err != nil {
-				hlog.HLog(ERROR, p, 2, "failed to dump sandbox %s: %v", sb.Id, err)
-				return err
-			}
-			return saveMessage(p.factory.db, fmt.Sprintf(SB_KEY_FMT, p.Id()), &sb, p, "sandbox info")
+		return saveMessage(p.factory.db, fmt.Sprintf(SB_KEY_FMT, p.Id()), &sb, p, "sandbox info")
 
-		}
+	}
 
 	return nil
 }