XPod: add snapVolumes as snapshot of volumes

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

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

Author: teawater

daemon/pod/persist.go

@@ -128,6 +128,11 @@ func LoadXPod(factory *PodFactory, layout *types.PersistPodLayout) (*XPod, error
 		for _, v := range p.volumes {
 			v.status = S_VOLUME_INSERTED
 		}
+		p.statusLock.Lock()
+		for index := range p.snapVolumes {
+			p.snapVolumes[index] = p.volumes[index].Info()
+		}
+		p.statusLock.Unlock()
 	}
 
 	err = p.loadPodMeta()
@@ -403,6 +408,9 @@ func (p *XPod) loadVolume(id string) error {
 	v.descript = vx.Descript
 	v.status = S_VOLUME_CREATED
 	p.volumes[v.spec.Name] = v
+	p.statusLock.Lock()
+	p.snapVolumes[v.spec.Name] = p.volumes[v.spec.Name].Info()
+	p.statusLock.Unlock()
 	return nil
 }
 

daemon/pod/pod.go

@@ -78,6 +78,9 @@ type XPod struct {
 	// on it too.
 	stoppedChan chan bool
 	initCond    *sync.Cond
+
+	//Protected by statusLock
+	snapVolumes map[string]*apitypes.PodVolume
 }
 
 // The Log infrastructure, to add pod name as prefix of the log message.
@@ -339,14 +342,14 @@ func (p *XPod) updatePodInfo() error {
 
 	var (
 		containers      = make([]*apitypes.Container, 0, len(p.containers))
-		volumes         = make([]*apitypes.PodVolume, 0, len(p.volumes))
+		volumes         = make([]*apitypes.PodVolume, 0, len(p.snapVolumes))
 		containerStatus = make([]*apitypes.ContainerStatus, 0, len(p.containers))
 	)
 
 	p.info.Spec.Labels = p.labels
 
-	for _, v := range p.volumes {
-		volumes = append(volumes, v.Info())
+	for _, v := range p.snapVolumes {
+		volumes = append(volumes, v)
 	}
 	p.info.Spec.Volumes = volumes
 

daemon/pod/provision.go

@@ -101,6 +101,7 @@ func newXPod(factory *PodFactory, spec *apitypes.UserPod) (*XPod, error) {
 		statusLock:    &sync.RWMutex{},
 		stoppedChan:   make(chan bool, 1),
 		factory:       factory,
+		snapVolumes:   make(map[string]*apitypes.PodVolume),
 	}
 	p.initCond = sync.NewCond(p.statusLock.RLocker())
 	return p, nil
@@ -152,6 +153,9 @@ func (p *XPod) doContainerCreate(c *apitypes.UserContainer) (string, error) {
 			continue
 		}
 		p.volumes[vol.Name] = newVolume(p, vol)
+		p.statusLock.Lock()
+		p.snapVolumes[vol.Name] = p.volumes[vol.Name].Info()
+		p.statusLock.Unlock()
 		nvs = append(nvs, vol.Name)
 	}
 	pc.Log(TRACE, "volumes to be added: %v", nvs)
@@ -373,6 +377,9 @@ func (p *XPod) initResources(spec *apitypes.UserPod, allowCreate bool) error {
 				continue
 			}
 			p.volumes[vol.Name] = newVolume(p, vol)
+			p.statusLock.Lock()
+			p.snapVolumes[vol.Name] = p.volumes[vol.Name].Info()
+			p.statusLock.Unlock()
 		}
 	}