add rmdata logic to pgo delete backup command, update docs to better describe this command

Author: jmccormick2001

apiserver/backupservice/backupimpl.go

@@ -66,16 +66,30 @@ func DeleteBackup(backupName string) msgs.DeleteBackupResponse {
 	var err error
 
 	if backupName == "all" {
-		err = kubeapi.DeleteAllpgbackup(apiserver.RESTClient, apiserver.Namespace)
-		resp.Results = append(resp.Results, "all")
-	} else {
-		err = kubeapi.Deletepgbackup(apiserver.RESTClient, backupName, apiserver.Namespace)
-		resp.Results = append(resp.Results, backupName)
+		resp.Status.Code = msgs.Error
+		resp.Status.Msg = "all not a valid cluster name"
+		return resp
 	}
 
+	err = kubeapi.Deletepgbackup(apiserver.RESTClient, backupName, apiserver.Namespace)
+
+	if err != nil {
+		resp.Status.Code = msgs.Error
+		resp.Status.Msg = err.Error()
+		return resp
+	}
+	resp.Results = append(resp.Results, backupName)
+
+	//create a pgtask to remove the PVC and its data
+	pvcName := backupName + "-backup"
+	dataRoots := []string{backupName + "-backups"}
+
+	storageSpec := crv1.PgStorageSpec{}
+	err = apiserver.CreateRMDataTask(storageSpec, backupName, pvcName, dataRoots)
 	if err != nil {
 		resp.Status.Code = msgs.Error
 		resp.Status.Msg = err.Error()
+		return resp
 	}
 
 	return resp

apiserver/clusterservice/clusterimpl.go

@@ -23,7 +23,6 @@ import (
 	log "github.com/Sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	"github.com/crunchydata/postgres-operator/apiserver"
-	//"github.com/crunchydata/postgres-operator/apiserver/pvcservice"
 	"strconv"
 	"strings"
 	"time"
@@ -894,20 +893,6 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 
 	var err error
 
-	log.Info("inside createDeleteDataTasks")
-
-	//get the pods for this cluster
-	/**
-	spec := crv1.PgclusterSpec{}
-	cluster := &crv1.Pgcluster{
-		ObjectMeta: meta_v1.ObjectMeta{
-			Name: clusterName,
-		},
-		Spec: spec,
-	}
-	cluster.Spec.Name = clusterName
-	*/
-
 	selector := util.LABEL_PG_CLUSTER + "=" + clusterName + "," + util.LABEL_PGBACKUP + "!=true"
 	log.Debugf("selector for delete is %s", selector)
 	pods, err := kubeapi.GetPods(apiserver.Clientset, selector, apiserver.Namespace)
@@ -940,7 +925,10 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 
 			if v.VolumeSource.PersistentVolumeClaim != nil {
 				log.Debugf("volume [%s] pvc [%s] dataroots [%v]\n", v.Name, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
-				createTask(storageSpec, clusterName, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
+				err := apiserver.CreateRMDataTask(storageSpec, clusterName, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}
@@ -970,14 +958,19 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 				//by convention, the root directory name
 				//created by the backup job is depName-backups
 				dataRoots := []string{dep.Name + "-backups"}
-				createTask(storageSpec, clusterName, pvcName, dataRoots)
+				err = apiserver.CreateRMDataTask(storageSpec, clusterName, pvcName, dataRoots)
+				if err != nil {
+					log.Error(err)
+					return err
+				}
 			}
 
 		}
 	}
 	return err
 }
 
+/**
 func createTask(storageSpec crv1.PgStorageSpec, clusterName, pvcName string, dataRoots []string) {
 	//create a pgtask for each root at this volume/pvc
 	for i := 0; i < len(dataRoots); i++ {
@@ -1012,6 +1005,7 @@ func createTask(storageSpec crv1.PgStorageSpec, clusterName, pvcName string, dat
 	}
 
 }
+*/
 
 func getType(pod *v1.Pod) string {
 

apiserver/clusterservice/scaleimpl.go

@@ -401,7 +401,10 @@ func createDeleteDataTasksForReplica(replicaName string, storageSpec crv1.PgStor
 
 			if v.VolumeSource.PersistentVolumeClaim != nil {
 				log.Debugf("volume [%s] pvc [%s] dataroots [%v]\n", v.Name, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
-				createTask(storageSpec, replicaName, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
+				err = apiserver.CreateRMDataTask(storageSpec, replicaName, v.VolumeSource.PersistentVolumeClaim.ClaimName, dataRoots)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}

apiserver/common.go

@@ -20,6 +20,8 @@ import (
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
 	"github.com/crunchydata/postgres-operator/kubeapi"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/crunchydata/postgres-operator/util"
 	"k8s.io/api/core/v1"
 )
@@ -86,3 +88,42 @@ func GetPVCName(pod *v1.Pod) map[string]string {
 	return pvcList
 
 }
+
+func CreateRMDataTask(storageSpec crv1.PgStorageSpec, clusterName, pvcName string, dataRoots []string) error {
+	var err error
+
+	//create a pgtask for each root at this volume/pvc
+	for i := 0; i < len(dataRoots); i++ {
+
+		//create pgtask CRD
+		spec := crv1.PgtaskSpec{}
+		spec.Name = pvcName
+		spec.TaskType = crv1.PgtaskDeleteData
+		spec.StorageSpec = storageSpec
+
+		spec.Parameters = make(map[string]string)
+		spec.Parameters[util.LABEL_PVC_NAME] = pvcName
+		spec.Parameters[util.LABEL_DATA_ROOT] = dataRoots[i]
+		spec.Parameters[util.LABEL_PG_CLUSTER] = clusterName
+
+		newInstance := &crv1.Pgtask{
+			ObjectMeta: meta_v1.ObjectMeta{
+				Name: pvcName,
+			},
+			Spec: spec,
+		}
+		newInstance.ObjectMeta.Labels = make(map[string]string)
+		newInstance.ObjectMeta.Labels[util.LABEL_PG_CLUSTER] = clusterName
+		//newInstance.ObjectMeta.Labels[util.LABEL_DATA_ROOT] = dataRoots[i]
+		newInstance.ObjectMeta.Labels[util.LABEL_RMDATA] = "true"
+
+		err := kubeapi.Createpgtask(RESTClient,
+			newInstance, Namespace)
+		if err != nil {
+			log.Error(err)
+			return err
+		}
+	}
+	return err
+
+}

hugo/content/getting-started/_index.adoc

@@ -607,6 +607,11 @@ To delete a backup enter the following:
 pgo delete backup mycluster
 ....
 
+When run, this command removes the PVC used for the backups, and
+runs the *rmdata* Job to physically perform data removal of that PVC's
+contents.  It also removes the pgbackup CRD for this cluster that holds
+the last pg_basebackup results.
+
 === Scheduling
 
 The `schedule` command will generate schedule configuration maps that are utitlized by the