fix(backup): bugs fixes

Author: dkropachev

pkg/restapi/backup.go

@@ -217,6 +217,7 @@ func (h backupHandler) purge(w http.ResponseWriter, r *http.Request) {
 		respondError(w, r, errors.Wrap(err, "manual purge snapshots"))
 		return
 	}
+
 	render.Respond(w, r, ConvertManifestsToListItems(deleted))
 }
 
@@ -232,13 +233,28 @@ func ConvertManifestsToListItems(deleted backupspec.Manifests) backup.ListItems
 				Units:     nil,
 				SnapshotInfo: []backup.SnapshotInfo{{
 					SnapshotTag: manifest.SnapshotTag,
+					Nodes:       1,
 				}},
 			}
 			out = append(out, &item)
 			continue
 		}
-		snInfo := backup.SnapshotInfo{SnapshotTag: manifest.SnapshotTag}
-		out[idx].SnapshotInfo = append(out[idx].SnapshotInfo, snInfo)
+
+		// Found SnapshotInfo with same snapshotTag.
+		found := false
+		for sIdx := range out[idx].SnapshotInfo {
+			if out[idx].SnapshotInfo[sIdx].SnapshotTag == manifest.SnapshotTag {
+				out[idx].SnapshotInfo[sIdx].Nodes++
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			// If not found - creates new one SnapshotInfo.
+			snInfo := backup.SnapshotInfo{SnapshotTag: manifest.SnapshotTag, Nodes: 1}
+			out[idx].SnapshotInfo = append(out[idx].SnapshotInfo, snInfo)
+		}
 	}
 	return out
 }
@@ -247,7 +263,7 @@ func (h backupHandler) dryRunToCtx(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Read dry-run tag from the request
 		dryRun := false
-		if v := r.FormValue("dry_run"); v != "" {
+		if v := r.FormValue("dry_run"); v == "true" {
 			dryRun = true
 		}
 
@@ -260,7 +276,7 @@ func (h backupHandler) dryRunToCtx(next http.Handler) http.Handler {
 func (h backupHandler) getDryRunFromCtx(r *http.Request) bool {
 	v, ok := r.Context().Value(ctxDryRun).(bool)
 	if !ok {
-		panic("missing filter in context")
+		panic("missing dryRun in context")
 	}
 	return v
 }

pkg/service/backup/backupspec/manifest.go

@@ -5,6 +5,7 @@ package backupspec
 import (
 	"compress/gzip"
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
 	"path"
@@ -13,10 +14,12 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
+	"go.uber.org/multierr"
+
 	"github.com/scylladb/scylla-manager/v3/pkg/util/inexlist/ksfilter"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/pathparser"
+	"github.com/scylladb/scylla-manager/v3/pkg/util/slice"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/uuid"
-	"go.uber.org/multierr"
 )
 
 // ManifestInfo represents manifest on remote location.
@@ -33,20 +36,33 @@ type ManifestInfo struct {
 // Manifests is a slice of ManifestInfo.
 type Manifests []*ManifestInfo
 
-// Len returns array len.
+// Len returns slice len.
 func (l Manifests) Len() int {
 	return len(l)
 }
 
-// GetBySnapshot returns map of ManifestInfo where key is SnapshotTag.
-func (l Manifests) GetBySnapshot() map[string]*ManifestInfo {
-	out := make(map[string]*ManifestInfo)
+// Str returns a string contains all ManifestInfo separated by a newline.
+func (l Manifests) Str() string {
+	if l.Len() == 0 {
+		return ""
+	}
+	out := ""
 	for idx := range l {
-		out[l[idx].SnapshotTag] = l[idx]
+		out += fmt.Sprintf("\n%+v", l[idx])
 	}
+	out += "\n"
 	return out
 }
 
+// GetSnapshots returns slice unique SnapshotTag.
+func (l Manifests) GetSnapshots() []string {
+	out := make([]string, l.Len())
+	for idx := range l {
+		out[idx] = l[idx].SnapshotTag
+	}
+	return slice.UniqueNP(out)
+}
+
 // Path returns path to the file that manifest points to.
 func (m *ManifestInfo) Path() string {
 	f := RemoteManifestFile(m.ClusterID, m.TaskID, m.SnapshotTag, m.DC, m.NodeID)

pkg/service/backup/model.go

@@ -10,8 +10,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/scylladb/scylla-manager/v3/pkg/service/scheduler"
-
 	"github.com/gocql/gocql"
 	"github.com/pkg/errors"
 	"github.com/scylladb/go-set/strset"
@@ -20,6 +18,7 @@ import (
 
 	"github.com/scylladb/scylla-manager/v3/pkg/scyllaclient"
 	. "github.com/scylladb/scylla-manager/v3/pkg/service/backup/backupspec"
+	"github.com/scylladb/scylla-manager/v3/pkg/service/scheduler"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/uuid"
 )
 

pkg/service/backup/purger_test.go

@@ -100,7 +100,7 @@ func TestStaleTags(t *testing.T) {
 		"sm_19700101000040UTC",
 		deletedByRetentionTag,
 	}
-	manifests.GetBySnapshot()
+
 	if diff := cmp.Diff(tags.List(), expected, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {
 		t.Fatalf("staleTags() = %s, diff:\n%s", tags.List(), diff)
 	}

pkg/service/backup/service.go

@@ -13,6 +13,8 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"go.uber.org/atomic"
+
 	"github.com/scylladb/go-log"
 	"github.com/scylladb/go-set/strset"
 	"github.com/scylladb/gocqlx/v2"
@@ -30,7 +32,6 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/util/parallel"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/timeutc"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/uuid"
-	"go.uber.org/atomic"
 )
 
 var (
@@ -1190,24 +1191,23 @@ func (s *Service) DeleteSnapshot(ctx context.Context, clusterID uuid.UUID, locat
 //
 // It returns deleted Manifests. if dryRun is true nothing is deleted.
 func (s *Service) PurgeBackups(ctx context.Context, clusterID uuid.UUID, locations Locations, retentionMap RetentionMap, dryRun bool) (deleted Manifests, err error) {
-	if locations.Len() == 0 {
-		return nil, errorNoLocation
-	}
-	locations = locations.Unique()
-	logger := s.logger
+	logger := s.logger.Named("PurgeBackups")
 	if dryRun {
 		logger = log.NopLogger
 	}
-
-	logger.Info(ctx, "Purging stale snapshots...")
-
-	defer func(start time.Time) {
+	logger.Debug(ctx, "Start", "cluster", clusterID, "locations", locations, "retentionMap", retentionMap, "dryRun", dryRun)
+	start := timeutc.Now()
+	defer func() {
 		if err != nil {
-			logger.Error(ctx, "Manual purging stale snapshots failed see exact errors above", "duration", timeutc.Since(start))
-		} else {
-			logger.Info(ctx, "Done manual purging stale snapshots", "duration", timeutc.Since(start))
+			logger.Error(ctx, "Got an error", "error", err, "duration", timeutc.Since(start))
 		}
-	}(timeutc.Now())
+		logger.Debug(ctx, "Done", "deleted manifests", deleted, "duration", timeutc.Since(start))
+	}()
+
+	if locations.Len() == 0 {
+		return nil, errorNoLocation
+	}
+	locations = locations.Unique()
 
 	deleted = make(Manifests, 0)
 
@@ -1229,11 +1229,11 @@ func (s *Service) PurgeBackups(ctx context.Context, clusterID uuid.UUID, locatio
 	}
 
 	// List manifests in all locations
-	manifests, err := listManifestsInAllLocations(ctx, client, hosts, clusterID)
+	var manifests Manifests
+	manifests, err = listManifestsInAllLocations(ctx, client, hosts, clusterID)
 	if err != nil {
 		return nil, errors.Wrap(err, "list manifests")
 	}
-
 	// Get a list of stale tags
 	tags, oldest, err := staleTags(manifests, retentionMap, true)
 	if err != nil {
@@ -1262,16 +1262,17 @@ func (s *Service) PurgeBackups(ctx context.Context, clusterID uuid.UUID, locatio
 		p := newPurger(client, hostIP, logg)
 
 		p.OnDelete = func(total, success int) {
-			if !dryRun {
-				s.metrics.Backup.SetPurgeFiles(clusterID, hostIP, total, success)
+			if dryRun {
+				return
 			}
+			s.metrics.Backup.SetPurgeFiles(clusterID, hostIP, total, success)
 		}
 
 		logg.Info(ctx, "Purging stale snapshots of node from host")
 		defer logg.Info(ctx, "Done purging stale snapshots of node from host")
 
 		var del Manifests
-		del, err = p.PurgeSnapshotTags(ctx, manifests, tags, oldest, dryRun)
+		del, err = p.PurgeSnapshotTags(ctx, m, tags, oldest, dryRun)
 
 		if err != nil {
 			return err
@@ -1286,9 +1287,7 @@ func (s *Service) PurgeBackups(ctx context.Context, clusterID uuid.UUID, locatio
 		if dryRun {
 			return nil
 		}
-
-		for idx := range del {
-			snapshot := del[idx].SnapshotTag
+		for _, snapshot := range del.GetSnapshots() {
 			if err = client.DeleteSnapshot(ctx, hostIP, snapshot); err != nil {
 				logg.Error(ctx, "Failed to delete uploaded snapshot",
 					"host", hostIP,
@@ -1306,6 +1305,5 @@ func (s *Service) PurgeBackups(ctx context.Context, clusterID uuid.UUID, locatio
 	}
 
 	parallel.RunMap[string, Manifests](nodeIDManifests, runFunc, nil, 10)
-
 	return deleted, err
 }