Merge pull request zalando#295 from zalando-incubator/continue_on_delete_errors

sdudoladov · web-flow · commit e6d12b3480cd · 2018-05-22T10:44:43.000+02:00
Avoid terminating delete on errors.
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -628,44 +628,42 @@ func (c *Cluster) Update(oldSpec, newSpec *spec.Postgresql) error {
 // DCS, reuses the master's endpoint to store the leader related metadata. If we remove the endpoint
 // before the pods, it will be re-created by the current master pod and will remain, obstructing the
 // creation of the new cluster with the same name. Therefore, the endpoints should be deleted last.
-func (c *Cluster) Delete() error {
+func (c *Cluster) Delete() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	if err := c.deleteStatefulSet(); err != nil {
-		return fmt.Errorf("could not delete statefulset: %v", err)
+		c.logger.Warningf("could not delete statefulset: %v", err)
 	}
 
 	for _, obj := range c.Secrets {
 		if delete, user := c.shouldDeleteSecret(obj); !delete {
-			c.logger.Infof("not removing secret %q for the system user %q", obj.GetName(), user)
+			c.logger.Warningf("not removing secret %q for the system user %q", obj.GetName(), user)
 			continue
 		}
 		if err := c.deleteSecret(obj); err != nil {
-			return fmt.Errorf("could not delete secret: %v", err)
+			c.logger.Warningf("could not delete secret: %v", err)
 		}
 	}
 
 	if err := c.deletePodDisruptionBudget(); err != nil {
-		return fmt.Errorf("could not delete pod disruption budget: %v", err)
+		c.logger.Warningf("could not delete pod disruption budget: %v", err)
 	}
 
 	for _, role := range []PostgresRole{Master, Replica} {
 
 		if err := c.deleteEndpoint(role); err != nil {
-			return fmt.Errorf("could not delete %s endpoint: %v", role, err)
+			c.logger.Warningf("could not delete %s endpoint: %v", role, err)
 		}
 
 		if err := c.deleteService(role); err != nil {
-			return fmt.Errorf("could not delete %s service: %v", role, err)
+			c.logger.Warningf("could not delete %s service: %v", role, err)
 		}
 	}
 
 	if err := c.deletePatroniClusterObjects(); err != nil {
-		return fmt.Errorf("could not remove leftover patroni objects; %v", err)
+		c.logger.Warningf("could not remove leftover patroni objects; %v", err)
 	}
-
-	return nil
 }
 
 // ReceivePodEvent is called back by the controller in order to add the cluster's pod event to the queue.
diff --git a/pkg/controller/postgresql.go b/pkg/controller/postgresql.go
@@ -230,9 +230,7 @@ func (c *Controller) processEvent(event spec.ClusterEvent) {
 		teamName := strings.ToLower(cl.Spec.TeamID)
 
 		c.curWorkerCluster.Store(event.WorkerID, cl)
-		if err := cl.Delete(); err != nil {
-			lg.Errorf("could not delete cluster: %v", err)
-		}
+		cl.Delete()
 
 		func() {
 			defer c.clustersMu.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -628,44 +628,42 @@ func (c Cluster) Update(oldSpec, newSpec spec.Postgresql) error {`
`628`	`628`	`// DCS, reuses the master's endpoint to store the leader related metadata. If we remove the endpoint`
`629`	`629`	`// before the pods, it will be re-created by the current master pod and will remain, obstructing the`
`630`	`630`	`// creation of the new cluster with the same name. Therefore, the endpoints should be deleted last.`
`631`		`-func (c *Cluster) Delete() error {`
	`631`	`+func (c *Cluster) Delete() {`
`632`	`632`	`c.mu.Lock()`
`633`	`633`	`defer c.mu.Unlock()`
`634`	`634`
`635`	`635`	`if err := c.deleteStatefulSet(); err != nil {`
`636`		`- return fmt.Errorf("could not delete statefulset: %v", err)`
	`636`	`+ c.logger.Warningf("could not delete statefulset: %v", err)`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`for _, obj := range c.Secrets {`
`640`	`640`	`if delete, user := c.shouldDeleteSecret(obj); !delete {`
`641`		`- c.logger.Infof("not removing secret %q for the system user %q", obj.GetName(), user)`
	`641`	`+ c.logger.Warningf("not removing secret %q for the system user %q", obj.GetName(), user)`
`642`	`642`	`continue`
`643`	`643`	`}`
`644`	`644`	`if err := c.deleteSecret(obj); err != nil {`
`645`		`- return fmt.Errorf("could not delete secret: %v", err)`
	`645`	`+ c.logger.Warningf("could not delete secret: %v", err)`
`646`	`646`	`}`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`if err := c.deletePodDisruptionBudget(); err != nil {`
`650`		`- return fmt.Errorf("could not delete pod disruption budget: %v", err)`
	`650`	`+ c.logger.Warningf("could not delete pod disruption budget: %v", err)`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`for _, role := range []PostgresRole{Master, Replica} {`
`654`	`654`
`655`	`655`	`if err := c.deleteEndpoint(role); err != nil {`
`656`		`- return fmt.Errorf("could not delete %s endpoint: %v", role, err)`
	`656`	`+ c.logger.Warningf("could not delete %s endpoint: %v", role, err)`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`if err := c.deleteService(role); err != nil {`
`660`		`- return fmt.Errorf("could not delete %s service: %v", role, err)`
	`660`	`+ c.logger.Warningf("could not delete %s service: %v", role, err)`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`if err := c.deletePatroniClusterObjects(); err != nil {`
`665`		`- return fmt.Errorf("could not remove leftover patroni objects; %v", err)`
	`665`	`+ c.logger.Warningf("could not remove leftover patroni objects; %v", err)`
`666`	`666`	`}`
`667`		`-`
`668`		`- return nil`
`669`	`667`	`}`
`670`	`668`
`671`	`669`	`// ReceivePodEvent is called back by the controller in order to add the cluster's pod event to the queue.`