From fa7dccf3b6f55ff357538044b4e46ebc09d0fddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl>
Date: Mon, 26 Feb 2024 13:45:10 +0100
Subject: [PATCH] fix(backup): don't ignore uploadHost error

Fixes #3729
---
 pkg/service/backup/worker_snapshot.go | 2 +-
 pkg/service/backup/worker_upload.go   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/service/backup/worker_snapshot.go b/pkg/service/backup/worker_snapshot.go
index cae91536b1..7a98a36524 100644
--- a/pkg/service/backup/worker_snapshot.go
+++ b/pkg/service/backup/worker_snapshot.go
@@ -11,7 +11,7 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/util/timeutc"
 )
 
-func (w *worker) Snapshot(ctx context.Context, hosts []hostInfo, limits []DCLimit) (err error) {
+func (w *worker) Snapshot(ctx context.Context, hosts []hostInfo, limits []DCLimit) (err error) { // nolint: dupl
 	w.Logger.Info(ctx, "Taking snapshots...")
 	defer func(start time.Time) {
 		if err != nil {
diff --git a/pkg/service/backup/worker_upload.go b/pkg/service/backup/worker_upload.go
index 82622de0af..17bdf1b2d4 100644
--- a/pkg/service/backup/worker_upload.go
+++ b/pkg/service/backup/worker_upload.go
@@ -13,7 +13,7 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/util/timeutc"
 )
 
-func (w *worker) Upload(ctx context.Context, hosts []hostInfo, limits []DCLimit) (err error) {
+func (w *worker) Upload(ctx context.Context, hosts []hostInfo, limits []DCLimit) (err error) { // nolint: dupl
 	w.Logger.Info(ctx, "Uploading snapshot files...")
 	defer func(start time.Time) {
 		if err != nil {
@@ -25,7 +25,8 @@ func (w *worker) Upload(ctx context.Context, hosts []hostInfo, limits []DCLimit)
 
 	f := func(h hostInfo) error {
 		w.Logger.Info(ctx, "Uploading snapshot files on host", "host", h.IP)
-		if err := w.uploadHost(ctx, h); err == nil {
+		err := w.uploadHost(ctx, h)
+		if err == nil {
 			w.Logger.Info(ctx, "Done uploading snapshot files on host", "host", h.IP)
 		}
 		return err