reuse cleanup report for delete-pitr

Author: defbin

cmd/pbm-agent/delete.go

@@ -302,43 +302,21 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
 func deletePITRImpl(ctx context.Context, conn connect.Client, ts primitive.Timestamp) error {
 	l := log.LogEventFromContext(ctx)
 
-	cfg, err := config.GetConfig(ctx, conn)
-	if err != nil {
-		return errors.Wrap(err, "get config")
-	}
-
-	if cfg.PITR.Enabled && !cfg.PITR.OplogOnly {
-		ct, err := topo.GetClusterTime(ctx, conn)
-		if err != nil {
-			return errors.Wrap(err, "get cluster time")
-		}
-
-		lw, err := backup.FindBaseSnapshotLWBefore(ctx, conn, ct, primitive.Timestamp{})
-		if err != nil {
-			return errors.Wrap(err, "find previous snapshot")
-		}
-		if !lw.IsZero() {
-			if lw.T < ts.T || (lw.T == ts.T && (ts.I == 0 || lw.I < ts.I)) {
-				ts = lw
-			}
-		}
-	}
-
-	chunks, err := oplog.ListDeleteChunksBefore(ctx, conn, ts)
+	r, err := backup.MakeCleanupInfo(ctx, conn, ts)
 	if err != nil {
 		return errors.Wrap(err, "get pitr chunks")
 	}
-	if len(chunks) == 0 {
+	if len(r.Chunks) == 0 {
 		l.Debug("nothing to delete")
 		return nil
 	}
 
-	stg, err := util.StorageFromConfig(cfg.Storage, l)
+	stg, err := util.GetStorage(ctx, conn, l)
 	if err != nil {
 		return errors.Wrap(err, "get storage")
 	}
 
-	return deleteChunks(ctx, conn, stg, chunks)
+	return deleteChunks(ctx, conn, stg, r.Chunks)
 }
 
 func deleteChunks(ctx context.Context, m connect.Client, stg storage.Storage, chunks []oplog.OplogChunk) error {

cmd/pbm/delete.go

@@ -12,7 +12,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 	"github.com/percona/percona-backup-mongodb/pbm/backup"
-	"github.com/percona/percona-backup-mongodb/pbm/config"
 	"github.com/percona/percona-backup-mongodb/pbm/connect"
 	"github.com/percona/percona-backup-mongodb/pbm/ctrl"
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
@@ -188,24 +187,6 @@ func deletePITR(
 		}
 	}
 
-	enabled, oplogOnly, err := config.IsPITREnabled(ctx, conn)
-	if err != nil {
-		return nil, errors.Wrap(err, "check pitr status")
-	}
-
-	if enabled && !oplogOnly {
-		lw, err := backup.FindBaseSnapshotLWBefore(ctx,
-			conn, primitive.Timestamp{T: uint32(time.Now().UTC().Unix())}, primitive.Timestamp{})
-		if err != nil {
-			return nil, errors.Wrap(err, "find previous snapshot")
-		}
-		if !lw.IsZero() {
-			if lw.T < until.T || (lw.T == until.T && (until.I == 0 || lw.I < until.I)) {
-				until = lw
-			}
-		}
-	}
-
 	chunks, err := sdk.ListDeleteChunksBefore(ctx, pbm, until)
 	if err != nil {
 		return nil, errors.Wrap(err, "list chunks")

pbm/oplog/chunk.go

@@ -491,16 +491,3 @@ func HasSingleTimelineToCover(chunks []OplogChunk, from, till uint32) bool {
 
 	return false
 }
-
-func ListDeleteChunksBefore(ctx context.Context, conn connect.Client, ts primitive.Timestamp) ([]OplogChunk, error) {
-	f := bson.D{{"end_ts", bson.M{"$lt": ts}}}
-	o := options.Find().SetSort(bson.D{{"start_ts", 1}})
-	cur, err := conn.PITRChunksCollection().Find(ctx, f, o)
-	if err != nil {
-		return nil, errors.Wrap(err, "query")
-	}
-
-	rv := []OplogChunk{}
-	err = cur.All(ctx, &rv)
-	return rv, errors.Wrap(err, "cursor: all")
-}

sdk/util.go

@@ -11,7 +11,6 @@ import (
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
 	"github.com/percona/percona-backup-mongodb/pbm/errors"
 	"github.com/percona/percona-backup-mongodb/pbm/log"
-	"github.com/percona/percona-backup-mongodb/pbm/oplog"
 	"github.com/percona/percona-backup-mongodb/pbm/topo"
 )
 
@@ -93,5 +92,6 @@ func ListDeleteChunksBefore(
 	sc Client,
 	ts primitive.Timestamp,
 ) ([]OplogChunk, error) {
-	return oplog.ListDeleteChunksBefore(ctx, sc.(*clientImpl).conn, ts)
+	r, err := backup.MakeCleanupInfo(ctx, sc.(*clientImpl).conn, ts)
+	return r.Chunks, err
 }