Skip to content

fix: log explicit messages when bootstrap.dcs.standby_cluster can't parse #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vlsi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: log explicit messages when bootstrap.dcs.standby_cluster can't parse #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions operator/pkg/patroni/patroni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,17 @@ func UpdatePgbackRestSettings(configMap *corev1.ConfigMap, settings interface{},
return configMap, nil
}

func AddStandbyClusterSettings(cr *patroniv1.PatroniCore, configMap *corev1.ConfigMap, configMapKey string) {
func AddStandbyClusterSettings(cr *patroniv1.PatroniCore, configMap *corev1.ConfigMap, configMapKey string) error {
logger.Info("Apply standby cluster configuration in patroni template config map")
standbyClusterConfiguration := getStandbyClusterConfiguration(cr)
updateStandbyClusterSettings(configMap, standbyClusterConfiguration, configMapKey)
_, err := updateStandbyClusterSettings(configMap, standbyClusterConfiguration, configMapKey)
return err
}

func DeleteStandbyClusterSettings(configMap *corev1.ConfigMap, configMapKey string) {
func DeleteStandbyClusterSettings(configMap *corev1.ConfigMap, configMapKey string) error {
logger.Info("Delete standby cluster configuration in patroni template config map")
updateStandbyClusterSettings(configMap, "", configMapKey)
_, err := updateStandbyClusterSettings(configMap, "", configMapKey)
return err
}

func ClearStandbyClusterConfigurationConfigMap(patroniUrl string) error {
Expand Down Expand Up @@ -330,20 +332,41 @@ func GetCommandForPgbackrest(cr *patroniv1.PatroniCore, command string) string {
return command
}

func updateStandbyClusterSettings(configMap *corev1.ConfigMap, settings interface{}, configMapKey string) *corev1.ConfigMap {
func updateStandbyClusterSettings(configMap *corev1.ConfigMap, settings interface{}, configMapKey string) (*corev1.ConfigMap, error) {

var config map[string]interface{}
err := yaml.Unmarshal([]byte(configMap.Data[configMapKey]), &config)
if err != nil {
logger.Error("Could not unmarshal patroni config map", zap.Error(err))
return configMap, fmt.Errorf("could not unmarshal patroni config map: %w", err)
}
config["bootstrap"].(map[interface{}]interface{})["dcs"].(map[interface{}]interface{})["standby_cluster"] = settings

if config == nil {
logger.Error("Config map is nil after unmarshal")
return configMap, fmt.Errorf("config map is nil after unmarshal")
}

bootstrap, ok := config["bootstrap"].(map[interface{}]interface{})
if !ok || bootstrap == nil {
logger.Error("Config map missing 'bootstrap' section or wrong type")
return configMap, fmt.Errorf("config map missing 'bootstrap' section or wrong type")
}

dcs, ok := bootstrap["dcs"].(map[interface{}]interface{})
if !ok || dcs == nil {
logger.Error("Config map missing 'bootstrap.dcs' section or wrong type")
return configMap, fmt.Errorf("config map missing 'bootstrap.dcs' section or wrong type")
}

dcs["standby_cluster"] = settings

result, err := yaml.Marshal(config)
if err != nil {
logger.Error("Could not marshal patroni config map", zap.Error(err))
return configMap, fmt.Errorf("could not marshal patroni config map: %w", err)
}
configMap.Data[configMapKey] = string(result)
return configMap
return configMap, nil
}

func UpdatePostgreSQLParams(patroni *patroniv1.Patroni, patroniUrl string) error {
Expand Down
8 changes: 6 additions & 2 deletions operator/pkg/reconciler/patroni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,13 @@ func (r *PatroniReconciler) Reconcile() error {
}

if isStandbyClusterPresent {
patroni.AddStandbyClusterSettings(cr, patroniConfigMap, r.cluster.ConfigMapKey)
if err := patroni.AddStandbyClusterSettings(cr, patroniConfigMap, r.cluster.ConfigMapKey); err != nil {
return err
}
} else {
patroni.DeleteStandbyClusterSettings(patroniConfigMap, r.cluster.ConfigMapKey)
if err := patroni.DeleteStandbyClusterSettings(patroniConfigMap, r.cluster.ConfigMapKey); err != nil {
return err
}
}
if (patroniSpec.Dcs.Type == "etcd") || (patroniSpec.Dcs.Type == "etcd3") {
patroni.AddEtcdSettings(cr, patroniConfigMap, r.cluster.ConfigMapKey)
Expand Down
Loading