From 96baa9288e49080cd56529bb62b0023811cedf29 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Thu, 3 Jul 2025 16:03:22 +0200 Subject: [PATCH 1/4] K8SPG-781 add original error --- percona/watcher/wal.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index cb444ced0..1f0e81078 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -3,6 +3,7 @@ package watcher import ( "bytes" "context" + "fmt" "strings" "time" @@ -167,6 +168,7 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) if err != nil { + log.V(1).Info("failed to get primary pod", "err", err) return nil, PrimaryPodNotFound } @@ -203,7 +205,7 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGCluster, backup *pgv2.PerconaPGBackup) (time.Time, error) { primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) if err != nil { - return time.Time{}, PrimaryPodNotFound + return time.Time{}, fmt.Errorf("%w: %v", PrimaryPodNotFound, err) } pgbackrestInfo, err := pgbackrest.GetInfo(ctx, primary, backup.Spec.RepoName) From f42e70fd8d3ad37251a5207afb5554230f2fca4e Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Thu, 3 Jul 2025 16:07:00 +0200 Subject: [PATCH 2/4] K8SPG-781 add original error --- percona/watcher/wal.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index 1f0e81078..c572d3d62 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -168,7 +168,7 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) if err != nil { - log.V(1).Info("failed to get primary pod", "err", err) + log.Error(err, "failed to get primary pod") return nil, PrimaryPodNotFound } From 981791ada05d33af275a1fd655ac22bf74a82b6c Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Thu, 3 Jul 2025 16:16:35 +0200 Subject: [PATCH 3/4] K8SPG-781 add original error --- percona/watcher/wal.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index c572d3d62..b7e514586 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -3,7 +3,6 @@ package watcher import ( "bytes" "context" - "fmt" "strings" "time" @@ -204,8 +203,10 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGCluster, backup *pgv2.PerconaPGBackup) (time.Time, error) { primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) + log := logging.FromContext(ctx) if err != nil { - return time.Time{}, fmt.Errorf("%w: %v", PrimaryPodNotFound, err) + log.Error(err, "failed to get primary pod") + return time.Time{}, PrimaryPodNotFound } pgbackrestInfo, err := pgbackrest.GetInfo(ctx, primary, backup.Spec.RepoName) From 042bec1b663d6a7266059e88a10bf0366a622e73 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Wed, 9 Jul 2025 13:27:49 +0200 Subject: [PATCH 4/4] fix PR comments --- percona/watcher/wal.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index b7e514586..d6c3da51e 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -167,8 +167,7 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) if err != nil { - log.Error(err, "failed to get primary pod") - return nil, PrimaryPodNotFound + return nil, errors.Wrap(PrimaryPodNotFound, err.Error()) } log.V(1).Info("Getting latest commit timestamp from primary pod", "pod", primary.Name) @@ -203,10 +202,8 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGCluster, backup *pgv2.PerconaPGBackup) (time.Time, error) { primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) - log := logging.FromContext(ctx) if err != nil { - log.Error(err, "failed to get primary pod") - return time.Time{}, PrimaryPodNotFound + return time.Time{}, errors.Wrap(PrimaryPodNotFound, err.Error()) } pgbackrestInfo, err := pgbackrest.GetInfo(ctx, primary, backup.Spec.RepoName)