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

minor fix for restart TTL

This commit is contained in:
Felix Kunde 2021-10-18 17:36:34 +02:00
parent 2f4b554fec
commit db76b8c642
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cluster/streams.go
View File

@ -59,8 +59,8 @@ func (c *Cluster) deleteStreams() error {
func (c *Cluster) syncPostgresConfig() error { func (c *Cluster) syncPostgresConfig() error {
desiredPostgresConfig := c.Spec.Patroni desiredPatroniConfig := c.Spec.Patroni
slots := desiredPostgresConfig.Slots slots := desiredPatroniConfig.Slots
for _, stream := range c.Spec.Streams { for _, stream := range c.Spec.Streams {
slotName := c.getLogicalReplicationSlot(stream.Database) slotName := c.getLogicalReplicationSlot(stream.Database)
@ -80,7 +80,7 @@ func (c *Cluster) syncPostgresConfig() error {
for slotName, slot := range slots { for slotName, slot := range slots {
c.logger.Debugf("creating logical replication slot %q in database %q", slotName, slot["database"]) c.logger.Debugf("creating logical replication slot %q in database %q", slotName, slot["database"])
} }
desiredPostgresConfig.Slots = slots desiredPatroniConfig.Slots = slots
} else { } else {
return nil return nil
} }
@ -94,13 +94,13 @@ func (c *Cluster) syncPostgresConfig() error {
} }
for i, pod := range pods { for i, pod := range pods {
podName := util.NameFromMeta(pods[i].ObjectMeta) podName := util.NameFromMeta(pods[i].ObjectMeta)
effectivePostgresConfig, effectivePgParameters, err := c.patroni.GetConfig(&pod) effectivePatroniConfig, effectivePgParameters, err := c.patroni.GetConfig(&pod)
if err != nil { if err != nil {
c.logger.Warningf("could not get Postgres config from pod %s: %v", podName, err) c.logger.Warningf("could not get Postgres config from pod %s: %v", podName, err)
continue continue
} }
_, err = c.checkAndSetGlobalPostgreSQLConfiguration(&pod, effectivePostgresConfig, desiredPostgresConfig, effectivePgParameters, desiredPgParameters) _, err = c.checkAndSetGlobalPostgreSQLConfiguration(&pod, effectivePatroniConfig, desiredPatroniConfig, effectivePgParameters, desiredPgParameters)
if err != nil { if err != nil {
c.logger.Warningf("could not set PostgreSQL configuration options for pod %s: %v", podName, err) c.logger.Warningf("could not set PostgreSQL configuration options for pod %s: %v", podName, err)
continue continue

10
pkg/cluster/sync.go
View File

@ -271,7 +271,7 @@ func (c *Cluster) syncPodDisruptionBudget(isUpdate bool) error {
func (c *Cluster) syncStatefulSet() error { func (c *Cluster) syncStatefulSet() error {
var ( var (
masterPod *v1.Pod masterPod *v1.Pod
effectivePostgresConfig map[string]interface{} restartTTL uint32
instanceRestartRequired bool instanceRestartRequired bool
) )
@ -404,7 +404,6 @@ func (c *Cluster) syncStatefulSet() error {
emptyPatroniConfig := acidv1.Patroni{} emptyPatroniConfig := acidv1.Patroni{}
podName := util.NameFromMeta(pods[i].ObjectMeta) podName := util.NameFromMeta(pods[i].ObjectMeta)
patroniConfig, pgParameters, err := c.patroni.GetConfig(&pod) patroniConfig, pgParameters, err := c.patroni.GetConfig(&pod)
if err != nil { if err != nil {
c.logger.Warningf("could not get Postgres config from pod %s: %v", podName, err) c.logger.Warningf("could not get Postgres config from pod %s: %v", podName, err)
continue continue
@ -418,6 +417,7 @@ func (c *Cluster) syncStatefulSet() error {
c.logger.Warningf("could not set PostgreSQL configuration options for pod %s: %v", podName, err) c.logger.Warningf("could not set PostgreSQL configuration options for pod %s: %v", podName, err)
continue continue
} }
restartTTL = patroniConfig.TTL
break break
} }
} }
@ -425,10 +425,6 @@ func (c *Cluster) syncStatefulSet() error {
// if the config update requires a restart, call Patroni restart for replicas first, then master // if the config update requires a restart, call Patroni restart for replicas first, then master
if instanceRestartRequired { if instanceRestartRequired {
c.logger.Debug("restarting Postgres server within pods") c.logger.Debug("restarting Postgres server within pods")
ttl, ok := effectivePostgresConfig["ttl"].(int32)
if !ok {
ttl = 30
}
for i, pod := range pods { for i, pod := range pods {
role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel]) role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel])
if role == Master { if role == Master {
@ -436,7 +432,7 @@ func (c *Cluster) syncStatefulSet() error {
continue continue
} }
c.restartInstance(&pod) c.restartInstance(&pod)
time.Sleep(time.Duration(ttl) * time.Second) time.Sleep(time.Duration(restartTTL) * time.Second)
} }
if masterPod != nil { if masterPod != nil {