Merge pull request #317 from gao-feng/wait

wait cleanup job finished in stop pod

Author: gnawux

daemon/pod.go

@@ -38,6 +38,7 @@ type Pod struct {
 	ctnStartInfo []*hypervisor.ContainerInfo
 	volumes      map[string]*hypervisor.VolumeInfo
 	ttyList      map[string]*hypervisor.TtyIO
+	wg           *sync.WaitGroup
 
 	transiting chan bool
 	sync.RWMutex
@@ -241,6 +242,7 @@ func NewPod(podSpec *apitypes.UserPod, id string, data interface{}) (*Pod, error
 		ttyList:    make(map[string]*hypervisor.TtyIO),
 		volumes:    make(map[string]*hypervisor.VolumeInfo),
 		transiting: make(chan bool, 1),
+		wg:         new(sync.WaitGroup),
 	}
 
 	// fill one element in transit chan, only one parallel op is allowed
@@ -1190,6 +1192,7 @@ func (p *Pod) Start(daemon *Daemon, vmId string, lazy bool, streams []*hyperviso
 		return vmResponse, err
 	}
 
+	p.wg.Add(1)
 	err = daemon.db.UpdateVM(p.vm.Id, vmResponse.Data.([]byte))
 	if err != nil {
 		glog.Error(err.Error())

daemon/stop.go

@@ -16,6 +16,8 @@ func (daemon *Daemon) PodStopped(podId string) {
 		return
 	}
 
+	defer pod.wg.Done()
+
 	pod.Lock()
 	defer pod.Unlock()
 
@@ -81,18 +83,20 @@ func (daemon *Daemon) StopPodWithinLock(pod *Pod) (int, string, error) {
 	}
 
 	pod.Lock()
-	defer pod.Unlock()
 
 	if pod.vm == nil {
+		pod.Unlock()
 		return types.E_VM_SHUTDOWN, "", nil
 	}
 
 	if pod.status.Status != types.S_POD_RUNNING {
+		pod.Unlock()
 		glog.Errorf("Pod %s is not in running state, cannot be stopped", pod.Id)
 		return -1, "", fmt.Errorf("Pod %s is not in running state, cannot be stopped", pod.Id)
 	}
 
 	vmResponse := pod.vm.StopPod(pod.status)
-
+	pod.Unlock()
+	pod.wg.Wait()
 	return vmResponse.Code, vmResponse.Cause, nil
 }