Updates the job controller to only process backrest

andrewlecuyer · jkatz · commit ea6f45e56094 · 2019-12-22T12:02:38.000-05:00
backup jobs if they are not currently being deleted
(e.g. as the result of a foreground deletion).
diff --git a/controller/jobcontroller.go b/controller/jobcontroller.go
@@ -260,7 +260,8 @@ func (c *JobController) onUpdate(oldObj, newObj interface{}) {
 	}
 
 	//handle the case of a backrest job being added
-	if labels[config.LABEL_BACKREST] == "true" && labels[config.LABEL_BACKREST_COMMAND] == "backup" {
+	if !isForegroundDeletion && labels[config.LABEL_BACKREST] == "true" &&
+		labels[config.LABEL_BACKREST_COMMAND] == "backup" {
 		log.Debugf("jobController onUpdate backrest job case")
 		log.Debugf("got a backrest job status=%d", job.Status.Succeeded)
 		if job.Status.Succeeded == 1 {
@@ -305,7 +306,7 @@ func (c *JobController) onUpdate(oldObj, newObj interface{}) {
 					}
 					if clusterStatus == crv1.PgclusterStateRestore {
 						pgreplica.Spec.Status = "restore"
-					} else { 
+					} else {
 						pgreplica.Annotations[config.ANNOTATION_PGHA_BOOTSTRAP_REPLICA] = "true"
 					}
 					err = kubeapi.Updatepgreplica(c.JobClient, &pgreplica, pgreplica.Name, job.ObjectMeta.Namespace)

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,8 @@ func (c *JobController) onUpdate(oldObj, newObj interface{}) {`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`//handle the case of a backrest job being added`
`263`		`- if labels[config.LABEL_BACKREST] == "true" && labels[config.LABEL_BACKREST_COMMAND] == "backup" {`
	`263`	`+ if !isForegroundDeletion && labels[config.LABEL_BACKREST] == "true" &&`
	`264`	`+ labels[config.LABEL_BACKREST_COMMAND] == "backup" {`
`264`	`265`	`log.Debugf("jobController onUpdate backrest job case")`
`265`	`266`	`log.Debugf("got a backrest job status=%d", job.Status.Succeeded)`
`266`	`267`	`if job.Status.Succeeded == 1 {`
`@@ -305,7 +306,7 @@ func (c *JobController) onUpdate(oldObj, newObj interface{}) {`
`305`	`306`	`}`
`306`	`307`	`if clusterStatus == crv1.PgclusterStateRestore {`
`307`	`308`	`pgreplica.Spec.Status = "restore"`
`308`		`- } else {`
	`309`	`+ } else {`
`309`	`310`	`pgreplica.Annotations[config.ANNOTATION_PGHA_BOOTSTRAP_REPLICA] = "true"`
`310`	`311`	`}`
`311`	`312`	`err = kubeapi.Updatepgreplica(c.JobClient, &pgreplica, pgreplica.Name, job.ObjectMeta.Namespace)`