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

add c.replicationSlots on sync (#2238)

This commit is contained in:
Felix Kunde 2023-02-23 13:19:35 +01:00 committed by GitHub
parent 8356ebf097
commit e6fb57a6bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cluster/sync.go
View File

@ -413,6 +413,7 @@ func (c *Cluster) syncStatefulSet() error {
} }
// sync Patroni config // sync Patroni config
c.logger.Debug("syncing Patroni config")
if configPatched, restartPrimaryFirst, restartWait, err = c.syncPatroniConfig(pods, c.Spec.Patroni, requiredPgParameters); err != nil { if configPatched, restartPrimaryFirst, restartWait, err = c.syncPatroniConfig(pods, c.Spec.Patroni, requiredPgParameters); err != nil {
c.logger.Warningf("Patroni config updated? %v - errors during config sync: %v", configPatched, err) c.logger.Warningf("Patroni config updated? %v - errors during config sync: %v", configPatched, err)
isSafeToRecreatePods = false isSafeToRecreatePods = false
@ -641,18 +642,18 @@ func (c *Cluster) checkAndSetGlobalPostgreSQLConfiguration(pod *v1.Pod, effectiv
} }
// check if specified slots exist in config and if they differ // check if specified slots exist in config and if they differ
for slotName, desiredSlot := range desiredPatroniConfig.Slots { for slotName, desiredSlot := range desiredPatroniConfig.Slots {
if effectiveSlot, exists := effectivePatroniConfig.Slots[slotName]; exists {
if reflect.DeepEqual(desiredSlot, effectiveSlot) {
continue
}
}
slotsToSet[slotName] = desiredSlot
// only add slots specified in manifest to c.replicationSlots // only add slots specified in manifest to c.replicationSlots
for manifestSlotName, _ := range c.Spec.Patroni.Slots { for manifestSlotName, _ := range c.Spec.Patroni.Slots {
if manifestSlotName == slotName { if manifestSlotName == slotName {
c.replicationSlots[slotName] = desiredSlot c.replicationSlots[slotName] = desiredSlot
} }
} }
if effectiveSlot, exists := effectivePatroniConfig.Slots[slotName]; exists {
if reflect.DeepEqual(desiredSlot, effectiveSlot) {
continue
}
}
slotsToSet[slotName] = desiredSlot
} }
if len(slotsToSet) > 0 { if len(slotsToSet) > 0 {
configToSet["slots"] = slotsToSet configToSet["slots"] = slotsToSet