public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve wait for delete logic and reuse config parameters

This commit is contained in:
Felix Kunde 2019-11-25 16:18:04 +01:00
parent bbb424dc2d
commit dcef7d5d51
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/cluster/resources.go
View File

@ -13,7 +13,6 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"github.com/zalando/postgres-operator/pkg/util" "github.com/zalando/postgres-operator/pkg/util"
"github.com/zalando/postgres-operator/pkg/util/constants"
"github.com/zalando/postgres-operator/pkg/util/k8sutil" "github.com/zalando/postgres-operator/pkg/util/k8sutil"
"github.com/zalando/postgres-operator/pkg/util/retryutil" "github.com/zalando/postgres-operator/pkg/util/retryutil"
) )
@ -278,7 +277,8 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *appsv1.StatefulSet) error {
oldStatefulset := c.Statefulset oldStatefulset := c.Statefulset
options := metav1.DeleteOptions{PropagationPolicy: &deletePropagationPolicy} options := metav1.DeleteOptions{PropagationPolicy: &deletePropagationPolicy}
if err := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Delete(oldStatefulset.Name, &options); err != nil { err := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Delete(oldStatefulset.Name, &options)
if err != nil {
return fmt.Errorf("could not delete statefulset %q: %v", statefulSetName, err) return fmt.Errorf("could not delete statefulset %q: %v", statefulSetName, err)
} }
// make sure we clear the stored statefulset status if the subsequent create fails. // make sure we clear the stored statefulset status if the subsequent create fails.
@ -286,11 +286,16 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *appsv1.StatefulSet) error {
// wait until the statefulset is truly deleted // wait until the statefulset is truly deleted
c.logger.Debugf("waiting for the statefulset to be deleted") c.logger.Debugf("waiting for the statefulset to be deleted")
err := retryutil.Retry(constants.ResourceDeletionInterval, constants.ResourceDeletionTimeout, err = retryutil.Retry(c.OpConfig.ResourceCheckInterval, c.OpConfig.ResourceCheckTimeout,
func() (bool, error) { func() (bool, error) {
_, err := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Get(oldStatefulset.Name, metav1.GetOptions{}) _, err2 := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Get(oldStatefulset.Name, metav1.GetOptions{})
if err2 == nil {
return err != nil, nil return false, nil
}
if k8sutil.ResourceNotFound(err2) {
return true, nil
}
return false, err2
}) })
if err != nil { if err != nil {
return fmt.Errorf("could not delete statefulset: %v", err) return fmt.Errorf("could not delete statefulset: %v", err)
@ -383,11 +388,16 @@ func (c *Cluster) updateService(role PostgresRole, newService *v1.Service) error
// wait until the service is truly deleted // wait until the service is truly deleted
c.logger.Debugf("waiting for service to be deleted") c.logger.Debugf("waiting for service to be deleted")
err = retryutil.Retry(constants.ResourceDeletionInterval, constants.ResourceDeletionTimeout, err = retryutil.Retry(c.OpConfig.ResourceCheckInterval, c.OpConfig.ResourceCheckTimeout,
func() (bool, error) { func() (bool, error) {
_, err := c.KubeClient.Services(serviceName.Namespace).Get(serviceName.Name, metav1.GetOptions{}) _, err2 := c.KubeClient.Services(serviceName.Namespace).Get(serviceName.Name, metav1.GetOptions{})
if err2 == nil {
return err != nil, nil return false, nil
}
if k8sutil.ResourceNotFound(err2) {
return true, nil
}
return false, err2
}) })
if err != nil { if err != nil {
return fmt.Errorf("could not delete service %q: %v", serviceName, err) return fmt.Errorf("could not delete service %q: %v", serviceName, err)

8
pkg/util/constants/kubernetes.go
View File

@ -4,11 +4,9 @@ import "time"
// General kubernetes-related constants // General kubernetes-related constants
const ( const (
PostgresContainerName = "postgres" PostgresContainerName = "postgres"
PostgresContainerIdx = 0 PostgresContainerIdx = 0
K8sAPIPath = "/apis" K8sAPIPath = "/apis"
ResourceDeletionInterval = 1 * time.Second
ResourceDeletionTimeout = 30 * time.Second
QueueResyncPeriodPod = 5 * time.Minute QueueResyncPeriodPod = 5 * time.Minute
QueueResyncPeriodTPR = 5 * time.Minute QueueResyncPeriodTPR = 5 * time.Minute