Merge eefb45ca5a into f12c978732

Signed-off-by: Gabriele Bartolini <gabriele.bartolini@enterprisedb.com>

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+# Contributing to CloudNativePG
+
+Thank you for your interest in contributing! 💖
+
+To ensure consistency across the project, all CloudNativePG repositories follow
+a common set of guidelines regarding code of conduct, AI usage, and
+contribution workflows.
+
+Please review the [CloudNativePG Project contributing guidelines](https://github.com/cloudnative-pg/governance/blob/main/CONTRIBUTING.md)
+before searching for issues, reporting bugs, or submitting a pull request.

internal/cnpgi/instance/recovery_window.go

@@ -33,7 +33,8 @@ import (
 )
 
 // updateRecoveryWindow updates the recovery window inside the object
-// store status subresource
+// store status subresource. It uses retry logic to handle concurrent
+// updates from backup completion and retention policy enforcement.
 func updateRecoveryWindow(
 	ctx context.Context,
 	c client.Client,
@@ -41,6 +42,14 @@ func updateRecoveryWindow(
 	objectStore *barmancloudv1.ObjectStore,
 	serverName string,
 ) error {
+	objectStoreKey := client.ObjectKeyFromObject(objectStore)
+
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		var freshObjectStore barmancloudv1.ObjectStore
+		if err := c.Get(ctx, objectStoreKey, &freshObjectStore); err != nil {
+			return err
+		}
+
 		// Set the recovery window inside the barman object store object
 		convertTime := func(t *time.Time) *metav1.Time {
 			if t == nil {
@@ -49,16 +58,17 @@ func updateRecoveryWindow(
 			return ptr.To(metav1.NewTime(*t))
 		}
 
-	recoveryWindow := objectStore.Status.ServerRecoveryWindow[serverName]
+		recoveryWindow := freshObjectStore.Status.ServerRecoveryWindow[serverName]
 		recoveryWindow.FirstRecoverabilityPoint = convertTime(backupList.GetFirstRecoverabilityPoint())
 		recoveryWindow.LastSuccessfulBackupTime = convertTime(backupList.GetLastSuccessfulBackupTime())
 
-	if objectStore.Status.ServerRecoveryWindow == nil {
-		objectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
+		if freshObjectStore.Status.ServerRecoveryWindow == nil {
+			freshObjectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
 		}
-	objectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
+		freshObjectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
 
-	return c.Status().Update(ctx, objectStore)
+		return c.Status().Update(ctx, &freshObjectStore)
+	})
 }
 
 // setLastFailedBackupTime sets the last failed backup time in the