From 3dde08643512ba854037dbb416c20ee85d58e232 Mon Sep 17 00:00:00 2001 From: Matthew Arnold Date: Thu, 18 Jul 2024 15:57:11 -0400 Subject: [PATCH 1/2] Avoid wrapping failed PVB status with empty message. Also change "get" to "found" as requested in issue #7857. Signed-off-by: Matthew Arnold --- pkg/cmd/cli/nodeagent/server.go | 2 +- pkg/controller/pod_volume_backup_controller.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/cli/nodeagent/server.go b/pkg/cmd/cli/nodeagent/server.go index 2748569f3d..16543794d3 100644 --- a/pkg/cmd/cli/nodeagent/server.go +++ b/pkg/cmd/cli/nodeagent/server.go @@ -412,7 +412,7 @@ func (s *nodeAgentServer) markInProgressPVBsFailed(client ctrlclient.Client) { } if err := controller.UpdatePVBStatusToFailed(s.ctx, client, &pvbs.Items[i], - fmt.Errorf("get a podvolumebackup with status %q during the server starting, mark it as %q", velerov1api.PodVolumeBackupPhaseInProgress, velerov1api.PodVolumeBackupPhaseFailed), + fmt.Errorf("found a podvolumebackup with status %q during the server starting, mark it as %q", velerov1api.PodVolumeBackupPhaseInProgress, velerov1api.PodVolumeBackupPhaseFailed), "", time.Now(), s.logger); err != nil { s.logger.WithError(errors.WithStack(err)).Errorf("failed to patch podvolumebackup %q", pvb.GetName()) continue diff --git a/pkg/controller/pod_volume_backup_controller.go b/pkg/controller/pod_volume_backup_controller.go index 224c328f9b..83bbc64c06 100644 --- a/pkg/controller/pod_volume_backup_controller.go +++ b/pkg/controller/pod_volume_backup_controller.go @@ -19,6 +19,7 @@ package controller import ( "context" "fmt" + "strings" "time" "github.com/pkg/errors" @@ -361,7 +362,11 @@ func UpdatePVBStatusToFailed(ctx context.Context, c client.Client, pvb *velerov1 if dataPathError, ok := errOut.(datapath.DataPathError); ok { pvb.Status.SnapshotID = dataPathError.GetSnapshotID() } - pvb.Status.Message = errors.WithMessage(errOut, msg).Error() + if len(strings.TrimSpace(msg)) == 0 { + pvb.Status.Message = errOut.Error() + } else { + pvb.Status.Message = errors.WithMessage(errOut, msg).Error() + } err := c.Patch(ctx, pvb, client.MergeFrom(original)) if err != nil { log.WithError(err).Error("error updating PodVolumeBackup status") From 76a3ecc99939f723d62c168a9374019f6a766414 Mon Sep 17 00:00:00 2001 From: Matthew Arnold Date: Thu, 18 Jul 2024 16:16:08 -0400 Subject: [PATCH 2/2] Add changelog file. Signed-off-by: Matthew Arnold --- changelogs/unreleased/8037-mrnold | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/unreleased/8037-mrnold diff --git a/changelogs/unreleased/8037-mrnold b/changelogs/unreleased/8037-mrnold new file mode 100644 index 0000000000..ce801be5a6 --- /dev/null +++ b/changelogs/unreleased/8037-mrnold @@ -0,0 +1 @@ +Avoid wrapping failed PVB status with empty message.