From 7369e4d99e81c8e18113c97c92e5aa91bbd08d02 Mon Sep 17 00:00:00 2001 From: Dylan Murray Date: Tue, 25 Aug 2020 11:51:50 -0400 Subject: [PATCH] Check for errors on restic backup command (#2863) * Check for errors on restic backup command Signed-off-by: Dylan Murray * Add changelog Signed-off-by: Dylan Murray --- changelogs/unreleased/2863-dymurray | 1 + pkg/restic/exec_commands.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/2863-dymurray diff --git a/changelogs/unreleased/2863-dymurray b/changelogs/unreleased/2863-dymurray new file mode 100644 index 000000000..4242b8b4e --- /dev/null +++ b/changelogs/unreleased/2863-dymurray @@ -0,0 +1 @@ +Check for errors on restic backup command diff --git a/pkg/restic/exec_commands.go b/pkg/restic/exec_commands.go index 7b4a4f167..2d0850139 100644 --- a/pkg/restic/exec_commands.go +++ b/pkg/restic/exec_commands.go @@ -90,7 +90,10 @@ func RunBackup(backupCmd *Command, log logrus.FieldLogger, updateFunc func(veler cmd.Stdout = stdoutBuf cmd.Stderr = stderrBuf - cmd.Start() + err := cmd.Start() + if err != nil { + return stdoutBuf.String(), stderrBuf.String(), err + } go func() { ticker := time.NewTicker(backupProgressCheckInterval) @@ -120,7 +123,10 @@ func RunBackup(backupCmd *Command, log logrus.FieldLogger, updateFunc func(veler } }() - cmd.Wait() + err = cmd.Wait() + if err != nil { + return stdoutBuf.String(), stderrBuf.String(), err + } quit <- struct{}{} summary, err := getSummaryLine(stdoutBuf.Bytes())