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

collect new and updated slots to patch patroni

This commit is contained in:
Felix Kunde 2021-10-06 20:09:41 +02:00
parent 4989d3b2dd
commit 8b169b5857
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cluster/sync.go
View File

@ -405,7 +405,7 @@ func (c *Cluster) syncStatefulSet() error {
// empty config probably means cluster is not fully initialized yet, e.g. restoring from backup // empty config probably means cluster is not fully initialized yet, e.g. restoring from backup
// to not attempt a restart in such situation // to not attempt a restart in such situation
if reflect.DeepEqual(patroniConfig, emptyPatroniConfig) || len(pgParameters) > 0 { if !reflect.DeepEqual(patroniConfig, emptyPatroniConfig) || len(pgParameters) > 0 {
instanceRestartRequired, err = c.checkAndSetGlobalPostgreSQLConfiguration(&pod, patroniConfig, pgParameters) instanceRestartRequired, err = c.checkAndSetGlobalPostgreSQLConfiguration(&pod, patroniConfig, pgParameters)
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)
@ -542,11 +542,17 @@ func (c *Cluster) checkAndSetGlobalPostgreSQLConfiguration(pod *v1.Pod, patroniC
// only check if specified slots exist in config and if they differ // only check if specified slots exist in config and if they differ
for slotName, desiredSlot := range desiredPatroniConfig.Slots { for slotName, desiredSlot := range desiredPatroniConfig.Slots {
desiredSlots := make(map[string]map[string]string)
if effectiveSlot, exists := patroniConfig.Slots[slotName]; exists { if effectiveSlot, exists := patroniConfig.Slots[slotName]; exists {
if !reflect.DeepEqual(desiredSlot, effectiveSlot) { if !reflect.DeepEqual(desiredSlot, effectiveSlot) {
configToSet["slots"] = desiredPatroniConfig.Slots desiredSlots[slotName] = desiredSlot
break
} }
} else {
desiredSlots[slotName] = desiredSlot
}
if len(desiredSlots) > 0 {
configToSet["slots"] = desiredSlots
} }
} }