XPod: add snapContainers as snapshot of containers

It handles the issue that XPod.updatePodInfo works without
XPod.resourceLock but access XPod.containers.

Signed-off-by: Hui Zhu <teawater@hyper.sh>

Author: teawater

daemon/pod/container.go

@@ -135,9 +135,7 @@ func (c *Container) CreatedAt() time.Time {
 	return ct
 }
 
-func (c *Container) Info() *apitypes.Container {
-	c.status.RLock()
-	defer c.status.RUnlock()
+func (c *Container) InfoLocked() *apitypes.Container {
 	cinfo := &apitypes.Container{
 		Name:            c.RuntimeName(),
 		ContainerID:     c.Id(),
@@ -188,9 +186,13 @@ func (c *Container) Info() *apitypes.Container {
 	return cinfo
 }
 
-func (c *Container) InfoStatus() *apitypes.ContainerStatus {
+func (c *Container) Info() *apitypes.Container {
 	c.status.RLock()
 	defer c.status.RUnlock()
+	return c.InfoLocked()
+}
+
+func (c *Container) InfoStatusLocked() *apitypes.ContainerStatus {
 	s := &apitypes.ContainerStatus{
 		Name:        c.SpecName(),
 		ContainerID: c.Id(),
@@ -226,6 +228,12 @@ func (c *Container) InfoStatus() *apitypes.ContainerStatus {
 	return s
 }
 
+func (c *Container) InfoStatus() *apitypes.ContainerStatus {
+	c.status.RLock()
+	defer c.status.RUnlock()
+	return c.InfoStatusLocked()
+}
+
 // Container life cycle operations:
 func (c *Container) Add() error {
 	return nil

daemon/pod/decommission.go

@@ -276,6 +276,9 @@ func (p *XPod) RemoveContainer(id string) error {
 	}
 	p.factory.registry.ReleaseContainer(id, c.SpecName())
 	delete(p.containers, id)
+	p.statusLock.Lock()
+	delete(p.snapContainers, id)
+	p.statusLock.Unlock()
 
 	//remove volumes from daemondb
 	for _, vName := range removedVols {

daemon/pod/persist.go

@@ -381,6 +381,9 @@ func (p *XPod) loadContainer(id string) error {
 		return err
 	}
 	p.containers[c.Id()] = c
+	p.statusLock.Lock()
+	p.snapContainers[c.Id()] = c
+	p.statusLock.Unlock()
 	return nil
 }
 

daemon/pod/pod.go

@@ -80,7 +80,8 @@ type XPod struct {
 	initCond    *sync.Cond
 
 	//Protected by statusLock
-	snapVolumes map[string]*apitypes.PodVolume
+	snapVolumes    map[string]*apitypes.PodVolume
+	snapContainers map[string]*Container
 }
 
 // The Log infrastructure, to add pod name as prefix of the log message.
@@ -341,9 +342,9 @@ func (p *XPod) updatePodInfo() error {
 	defer p.statusLock.Unlock()
 
 	var (
-		containers      = make([]*apitypes.Container, 0, len(p.containers))
+		containers      = make([]*apitypes.Container, 0, len(p.snapContainers))
 		volumes         = make([]*apitypes.PodVolume, 0, len(p.snapVolumes))
-		containerStatus = make([]*apitypes.ContainerStatus, 0, len(p.containers))
+		containerStatus = make([]*apitypes.ContainerStatus, 0, len(p.snapContainers))
 	)
 
 	p.info.Spec.Labels = p.labels
@@ -354,9 +355,9 @@ func (p *XPod) updatePodInfo() error {
 	p.info.Spec.Volumes = volumes
 
 	succeeeded := "Succeeded"
-	for _, c := range p.containers {
-		ci := c.Info()
-		cs := c.InfoStatus()
+	for _, c := range p.snapContainers {
+		ci := c.InfoLocked()
+		cs := c.InfoStatusLocked()
 		containers = append(containers, ci)
 		containerStatus = append(containerStatus, cs)
 		if cs.Phase == "failed" {

daemon/pod/provision.go

@@ -87,21 +87,22 @@ func newXPod(factory *PodFactory, spec *apitypes.UserPod) (*XPod, error) {
 	factory.hosts = HostsCreator(spec.Id)
 	factory.logCreator = initLogCreator(factory, spec)
 	p := &XPod{
-		name:          spec.Id,
-		logPrefix:     fmt.Sprintf("Pod[%s] ", spec.Id),
-		globalSpec:    spec.CloneGlobalPart(),
-		containers:    make(map[string]*Container),
-		volumes:       make(map[string]*Volume),
-		interfaces:    make(map[string]*Interface),
-		portMappings:  spec.Portmappings,
-		labels:        spec.Labels,
-		prestartExecs: [][]string{},
-		execs:         make(map[string]*Exec),
-		resourceLock:  &sync.Mutex{},
-		statusLock:    &sync.RWMutex{},
-		stoppedChan:   make(chan bool, 1),
-		factory:       factory,
-		snapVolumes:   make(map[string]*apitypes.PodVolume),
+		name:           spec.Id,
+		logPrefix:      fmt.Sprintf("Pod[%s] ", spec.Id),
+		globalSpec:     spec.CloneGlobalPart(),
+		containers:     make(map[string]*Container),
+		volumes:        make(map[string]*Volume),
+		interfaces:     make(map[string]*Interface),
+		portMappings:   spec.Portmappings,
+		labels:         spec.Labels,
+		prestartExecs:  [][]string{},
+		execs:          make(map[string]*Exec),
+		resourceLock:   &sync.Mutex{},
+		statusLock:     &sync.RWMutex{},
+		stoppedChan:    make(chan bool, 1),
+		factory:        factory,
+		snapVolumes:    make(map[string]*apitypes.PodVolume),
+		snapContainers: make(map[string]*Container),
 	}
 	p.initCond = sync.NewCond(p.statusLock.RLocker())
 	return p, nil
@@ -144,6 +145,9 @@ func (p *XPod) doContainerCreate(c *apitypes.UserContainer) (string, error) {
 	}
 
 	p.containers[pc.Id()] = pc
+	p.statusLock.Lock()
+	p.snapContainers[pc.Id()] = pc
+	p.statusLock.Unlock()
 
 	vols := pc.volumes()
 	nvs := make([]string, 0, len(vols))
@@ -370,6 +374,9 @@ func (p *XPod) initResources(spec *apitypes.UserPod, allowCreate bool) error {
 			return err
 		}
 		p.containers[c.Id()] = c
+		p.statusLock.Lock()
+		p.snapContainers[c.Id()] = c
+		p.statusLock.Unlock()
 
 		vols := c.volumes()
 		for _, vol := range vols {