clean up pvc listing in client

Author: Jeff McCormick

client/cmd/backup.go

@@ -132,7 +132,7 @@ func showBackupInfo(name string) {
 	if ShowPVC {
 		//print pvc information for all jobs
 		for key, _ := range pvcMap {
-			displayPVC(name, key)
+			PrintPVCListing(key)
 		}
 	}
 }
@@ -298,121 +298,3 @@ type PodTemplateFields struct {
 	BACKUP_ROOT  string
 	PVC_NAME     string
 }
-
-func displayPVC(name string, pvcName string) {
-	var POD_PATH = viper.GetString("PGO.LSPVC_TEMPLATE")
-	var PodTemplate *template.Template
-	var err error
-	var buf []byte
-	var doc2 bytes.Buffer
-	var podName = "lspvc-" + name
-
-	fmt.Println("PVC " + pvcName + " contains...")
-
-	//delete lspvc pod if it was not deleted for any reason prior
-	_, err = Clientset.Core().Pods(Namespace).Get(podName)
-	if errors.IsNotFound(err) {
-		//
-	} else if err != nil {
-		log.Error(err.Error())
-	} else {
-		log.Debug("deleting prior pod " + podName)
-		err = Clientset.Core().Pods(Namespace).Delete(podName,
-			&v1.DeleteOptions{})
-		if err != nil {
-			log.Error("delete pod error " + err.Error()) //TODO this is debug info
-		}
-		//sleep a bit for the pod to be deleted
-		time.Sleep(2000 * time.Millisecond)
-	}
-
-	buf, err = ioutil.ReadFile(POD_PATH)
-	if err != nil {
-		log.Error("error reading lspvc_template file")
-		log.Error("make sure it is specified in your .pgo.yaml config")
-		log.Error(err.Error())
-		return
-	}
-	PodTemplate = template.Must(template.New("pod template").Parse(string(buf)))
-
-	podFields := PodTemplateFields{
-		Name:         podName,
-		CO_IMAGE_TAG: viper.GetString("PGO.CO_IMAGE_TAG"),
-		BACKUP_ROOT:  name + "-backups",
-		PVC_NAME:     pvcName,
-	}
-
-	err = PodTemplate.Execute(&doc2, podFields)
-	if err != nil {
-		log.Error(err.Error())
-		return
-	}
-	podDocString := doc2.String()
-	log.Debug(podDocString)
-
-	//template name is lspvc-pod.json
-	//create lspvc pod
-	newpod := v1.Pod{}
-	err = json.Unmarshal(doc2.Bytes(), &newpod)
-	if err != nil {
-		log.Error("error unmarshalling json into Pod ")
-		log.Error(err.Error())
-		return
-	}
-	var resultPod *v1.Pod
-	resultPod, err = Clientset.Core().Pods(Namespace).Create(&newpod)
-	if err != nil {
-		log.Error("error creating lspvc Pod ")
-		log.Error(err.Error())
-		return
-	}
-	log.Debug("created pod " + resultPod.Name)
-
-	//sleep a bit for the pod to finish, replace later with watch or better
-	time.Sleep(3000 * time.Millisecond)
-
-	//get lspvc pod output
-	logOptions := v1.PodLogOptions{}
-	req := Clientset.Core().Pods(Namespace).GetLogs(podName, &logOptions)
-	if req == nil {
-		log.Debug("error in get logs for " + podName)
-	} else {
-		log.Debug("got the logs for " + podName)
-	}
-
-	readCloser, err := req.Stream()
-	if err != nil {
-		log.Error(err.Error())
-		return
-	}
-
-	defer readCloser.Close()
-	var buf2 bytes.Buffer
-	_, err = io.Copy(&buf2, readCloser)
-	log.Debugf("backups are... \n%s", buf2.String())
-
-	log.Debug("pvc=" + pvcName)
-	lines := strings.Split(buf2.String(), "\n")
-
-	//chop off last line since its only a newline
-	last := len(lines) - 1
-	newlines := make([]string, last)
-	copy(newlines, lines[:last])
-
-	for k, v := range newlines {
-		if k == len(newlines)-1 {
-			fmt.Printf("%s%s\n", TREE_TRUNK, name+"-backups/"+v)
-		} else {
-			fmt.Printf("%s%s\n", TREE_BRANCH, name+"-backups/"+v)
-		}
-	}
-
-	//delete lspvc pod
-	err = Clientset.Core().Pods(Namespace).Delete(podName,
-		&v1.DeleteOptions{})
-	if err != nil {
-		log.Error(err.Error())
-		log.Error("error deleting lspvc pod " + podName)
-	}
-
-}

client/cmd/pvc.go

@@ -140,6 +140,8 @@ func PrintPVCListing(pvcName string) {
 		log.Error("error waiting on lspvc pod to complete" + err.Error())
 	}
 
+	time.Sleep(5000 * time.Millisecond)
+
 	//get lspvc pod output
 	logOptions := v1.PodLogOptions{}
 	req := Clientset.Core().Pods(Namespace).GetLogs(podName, &logOptions)