Additional nil check

eberlep · eberlep · commit 273e30c4a9f5 · 2024-08-21T10:48:01.000+02:00
diff --git a/controllers/postgres_controller.go b/controllers/postgres_controller.go
@@ -1077,7 +1077,11 @@ func (r *PostgresReconciler) checkAndUpdatePatroniReplicationConfig(log logr.Log
 			} else {
 				synchronousStandbyApplicationName = pointer.String(s.ToPeripheralResourceName())
 			}
-			if resp.SynchronousNodesAdditional == nil || *resp.SynchronousNodesAdditional != *synchronousStandbyApplicationName {
+			// compare the actual value with the expected value
+			if synchronousStandbyApplicationName == nil {
+				log.V(debugLogLevel).Info("could not fetch synchronous_nodes_additional, disabling sync replication and requeing", "response", resp)
+				return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, nil)
+			} else if resp.SynchronousNodesAdditional == nil || *resp.SynchronousNodesAdditional != *synchronousStandbyApplicationName {
 				log.V(debugLogLevel).Info("synchronous_nodes_additional mismatch, updating and requeing", "response", resp)
 				return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, synchronousStandbyApplicationName)
 			}

Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,11 @@ func (r *PostgresReconciler) checkAndUpdatePatroniReplicationConfig(log logr.Log`
`1077`	`1077`	`} else {`
`1078`	`1078`	`synchronousStandbyApplicationName = pointer.String(s.ToPeripheralResourceName())`
`1079`	`1079`	`}`
`1080`		`- if resp.SynchronousNodesAdditional == nil \|\| resp.SynchronousNodesAdditional != synchronousStandbyApplicationName {`
	`1080`	`+ // compare the actual value with the expected value`
	`1081`	`+ if synchronousStandbyApplicationName == nil {`
	`1082`	`+ log.V(debugLogLevel).Info("could not fetch synchronous_nodes_additional, disabling sync replication and requeing", "response", resp)`
	`1083`	`+ return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, nil)`
	`1084`	`+ } else if resp.SynchronousNodesAdditional == nil \|\| resp.SynchronousNodesAdditional != synchronousStandbyApplicationName {`
`1081`	`1085`	`log.V(debugLogLevel).Info("synchronous_nodes_additional mismatch, updating and requeing", "response", resp)`
`1082`	`1086`	`return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, synchronousStandbyApplicationName)`
`1083`	`1087`	`}`