add pod's autoremove function

Author: carmark

daemon/pod.go

@@ -86,13 +86,17 @@ func (daemon *Daemon) CmdPodRun(job *engine.Job) error {
 	if daemon.GetRunningPodNum() >= 1024 {
 		return fmt.Errorf("Pod full, the maximum Pod is 1024!")
 	}
+	var autoremove bool = false
 	podArgs := job.Args[0]
+	if job.Args[1] == "yes" {
+		autoremove = true
+	}
 
 	podId := fmt.Sprintf("pod-%s", pod.RandStr(10, "alpha"))
 
 	glog.Info(podArgs)
 
-	code, cause, err := daemon.StartPod(podId, podArgs, "", nil, false, false, types.VM_KEEP_NONE)
+	code, cause, err := daemon.StartPod(podId, podArgs, "", nil, false, autoremove, types.VM_KEEP_NONE)
 	if err != nil {
 		glog.Error(err.Error())
 		return err
@@ -126,6 +130,7 @@ func (daemon *Daemon) CreatePod(podId, podArgs string, config interface{}, autor
 	mypod := hypervisor.NewPod(podId, userPod)
 	mypod.Handler.Handle = hyperHandlePodEvent
 	mypod.Handler.Data = daemon
+	mypod.Autoremove = autoremove
 
 	// store the UserPod into the db
 	if err := daemon.WritePodToDB(podId, []byte(podArgs)); err != nil {
@@ -641,6 +646,10 @@ func hyperHandlePodEvent(vmResponse *types.VmResponse, data interface{},
 		mypod.SetPodContainerStatus(vmResponse.Data.([]uint32))
 		mypod.Vm = ""
 		vm.Status = types.S_VM_IDLE
+		if mypod.Autoremove == true {
+			daemon.CleanPod(mypod.Id)
+			return false
+		}
 	} else if vmResponse.Code == types.E_VM_SHUTDOWN {
 		if mypod.Status == types.S_POD_RUNNING {
 			mypod.Status = types.S_POD_SUCCEEDED

daemon/stop.go

@@ -33,7 +33,12 @@ func (daemon *Daemon) CmdPodStop(job *engine.Job) error {
 func (daemon *Daemon) StopPod(podId, stopVm string) (int, string, error) {
 	glog.V(1).Infof("Prepare to stop the POD: %s", podId)
 	// find the vm id which running POD, and stop it
-	if daemon.PodList[podId].Status != types.S_POD_RUNNING {
+	mypod, ok := daemon.PodList[podId]
+	if !ok {
+		glog.Errorf("Can not find pod(%s)", podId)
+		return -1, "", fmt.Errorf("Can not find pod(%s)", podId)
+	}
+	if mypod.Status != types.S_POD_RUNNING {
 		return -1, "", fmt.Errorf("The POD %s has aleady stopped, can not stop again!", podId)
 	}
 	vmid, err := daemon.GetPodVmByName(podId)
@@ -42,9 +47,9 @@ func (daemon *Daemon) StopPod(podId, stopVm string) (int, string, error) {
 	}
 	// we need to set the 'RestartPolicy' of the pod to 'never' if stop command is invoked
 	// for kubernetes
-	if daemon.PodList[podId].Type == "kubernetes" {
-		daemon.PodList[podId].RestartPolicy = "never"
-		if daemon.PodList[podId].Vm == "" {
+	if mypod.Type == "kubernetes" {
+		mypod.RestartPolicy = "never"
+		if mypod.Vm == "" {
 			return types.E_VM_SHUTDOWN, "", nil
 		}
 	}
@@ -53,7 +58,6 @@ func (daemon *Daemon) StopPod(podId, stopVm string) (int, string, error) {
 	if !ok {
 		return -1, "", fmt.Errorf("VM is not exist")
 	}
-	mypod, _ := daemon.PodList[podId]
 
 	vmResponse := vm.StopPod(mypod, stopVm)
 
@@ -63,6 +67,9 @@ func (daemon *Daemon) StopPod(podId, stopVm string) (int, string, error) {
 	if vmResponse.Code == types.E_VM_SHUTDOWN {
 		daemon.RemoveVm(vmid)
 	}
+	if mypod.Autoremove == true {
+		daemon.CleanPod(podId)
+	}
 
 	return vmResponse.Code, vmResponse.Cause, nil
 }

utils/utils.go

@@ -17,7 +17,7 @@ import (
 
 var (
 	GITCOMMIT string = "0"
-	VERSION   string = "0.2.1"
+	VERSION   string = "0.3.0"
 
 	IAMSTATIC string = "true"
 	INITSHA1  string = ""