marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-01-13 14:13:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: missing backup pruning

Browse Source 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
This commit is contained in:
Marco Nenciarini 2025-03-14 18:19:40 +01:00
parent 1634495c31
commit c0b1ac1acf
No known key found for this signature in database
GPG Key ID: 589F03F01BA55038
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/cnpgi/instance/retention.go
View File

@ -11,12 +11,12 @@ import (
barmanCommand "github.com/cloudnative-pg/barman-cloud/pkg/command" barmanCommand "github.com/cloudnative-pg/barman-cloud/pkg/command"
barmanCredentials "github.com/cloudnative-pg/barman-cloud/pkg/credentials" barmanCredentials "github.com/cloudnative-pg/barman-cloud/pkg/credentials"
cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1" cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
"github.com/cloudnative-pg/machinery/pkg/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/utils/ptr" "k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
@ -209,9 +209,12 @@ func deleteBackupsNotInCatalog(
// A can violate 1 and 2 // A can violate 1 and 2
// A + B can still violate 2 // A + B can still violate 2
// B satisfies 1 and 2 // B satisfies 1 and 2
//
// We chose to go with B // We chose to go with B
contextLogger := log.FromContext(ctx)
contextLogger.Debug("Checking the catalog to delete backups not present anymore")
backups := cnpgv1.BackupList{} backups := cnpgv1.BackupList{}
if err := cli.List(ctx, &backups, client.InNamespace(cluster.GetNamespace())); err != nil { if err := cli.List(ctx, &backups, client.InNamespace(cluster.GetNamespace())); err != nil {
return fmt.Errorf("while getting backups: %w", err) return fmt.Errorf("while getting backups: %w", err)
@ -228,6 +231,7 @@ func deleteBackupsNotInCatalog(
// here we could add further checks, e.g. if the backup is not found but would still // here we could add further checks, e.g. if the backup is not found but would still
// be in the retention policy we could either not delete it or update it is status // be in the retention policy we could either not delete it or update it is status
if !slices.Contains(backupIDs, backup.Status.BackupID) { if !slices.Contains(backupIDs, backup.Status.BackupID) {
contextLogger.Info("Deleting backup not in the catalog", "backup", backup.Name)
if err := cli.Delete(ctx, &backups.Items[id]); err != nil { if err := cli.Delete(ctx, &backups.Items[id]); err != nil {
errors = append(errors, fmt.Errorf( errors = append(errors, fmt.Errorf(
"while deleting backup %s/%s: %w", "while deleting backup %s/%s: %w",
@ -248,7 +252,7 @@ func deleteBackupsNotInCatalog(
// useSameBackupLocation checks whether the given backup was taken using the same configuration as provided // useSameBackupLocation checks whether the given backup was taken using the same configuration as provided
func useSameBackupLocation(backup *cnpgv1.BackupStatus, cluster *cnpgv1.Cluster) bool { func useSameBackupLocation(backup *cnpgv1.BackupStatus, cluster *cnpgv1.Cluster) bool {
if cluster.Spec.Backup == nil || backup.Method != cnpgv1.BackupMethodPlugin { if backup.Method != cnpgv1.BackupMethodPlugin {
return false return false
} }