[PBM-1244] send backup type to agent on delete-backup

Author: defbin

cmd/pbm-agent/delete.go

@@ -87,8 +87,14 @@ func (a *Agent) Delete(ctx context.Context, d *ctrl.DeleteBackupCmd, opid ctrl.O
 			return
 		}
 
+		bcpType, err := backup.ParseDeleteBackupType(string(d.Type))
+		if err != nil {
+			l.Error("parse type field: %v", err.Error())
+			return
+		}
+
 		l.Info("deleting backups older than %v", t)
-		err = backup.DeleteBackupBefore(ctx, a.leadConn, t, "")
+		err = backup.DeleteBackupBefore(ctx, a.leadConn, t, bcpType)
 		if err != nil {
 			l.Error("deleting: %v", err)
 			return

cmd/pbm/delete.go

@@ -122,7 +122,10 @@ func deleteManyBackup(ctx context.Context, pbm sdk.Client, d *deleteBcpOpts) (sd
 		return sdk.NoOpID, errors.Errorf("--older-than %q is after now %q", providedTime, realTime)
 	}
 
-	bcpType := sdk.ParseBackupType(d.bcpType)
+	bcpType, err := backup.ParseDeleteBackupType(d.bcpType)
+	if err != nil {
+		return sdk.NoOpID, errors.Wrap(err, "parse --type")
+	}
 	backups, err := sdk.ListDeleteBackupBefore(ctx, pbm, ts, bcpType)
 	if err != nil {
 		return sdk.NoOpID, errors.Wrap(err, "fetch backup list")
@@ -141,7 +144,7 @@ func deleteManyBackup(ctx context.Context, pbm sdk.Client, d *deleteBcpOpts) (sd
 		}
 	}
 
-	cid, err := pbm.DeleteBackupBefore(ctx, ts)
+	cid, err := pbm.DeleteBackupBefore(ctx, ts, sdk.DeleteBackupBeforeOptions{Type: bcpType})
 	return cid, errors.Wrap(err, "schedule delete")
 }
 

pbm/backup/delete.go

@@ -20,6 +20,26 @@ import (
 
 const SelectiveBackup defs.BackupType = "selective"
 
+var ErrInvalidDeleteBackupType = errors.New("invalid backup type")
+
+func ParseDeleteBackupType(s string) (defs.BackupType, error) {
+	if s == "" {
+		return "", nil
+	}
+
+	switch s {
+	case
+		string(defs.PhysicalBackup),
+		string(defs.ExternalBackup),
+		string(defs.IncrementalBackup),
+		string(defs.LogicalBackup),
+		string(SelectiveBackup):
+		return defs.BackupType(s), nil
+	}
+
+	return "", ErrInvalidDeleteBackupType
+}
+
 var (
 	ErrBackupInProgress     = errors.New("backup is in progress")
 	ErrIncrementalBackup    = errors.New("backup is incremental")

sdk/impl.go

@@ -151,8 +151,12 @@ func (c *clientImpl) DeleteBackupByName(ctx context.Context, name string) (Comma
 	return CommandID(opid.String()), err
 }
 
-func (c *clientImpl) DeleteBackupBefore(ctx context.Context, beforeTS Timestamp) (CommandID, error) {
-	opid, err := ctrl.SendDeleteBackupBefore(ctx, c.conn, beforeTS, "")
+func (c *clientImpl) DeleteBackupBefore(
+	ctx context.Context,
+	beforeTS Timestamp,
+	options DeleteBackupBeforeOptions,
+) (CommandID, error) {
+	opid, err := ctrl.SendDeleteBackupBefore(ctx, c.conn, beforeTS, options.Type)
 	return CommandID(opid.String()), err
 }
 

sdk/sdk.go

@@ -92,6 +92,10 @@ type GetAllRestoresOptions struct {
 	Limit int64
 }
 
+type DeleteBackupBeforeOptions struct {
+	Type BackupType
+}
+
 type Command = ctrl.Cmd
 
 type Client interface {
@@ -112,7 +116,7 @@ type Client interface {
 	CancelBackup(ctx context.Context) (CommandID, error)
 
 	DeleteBackupByName(ctx context.Context, name string) (CommandID, error)
-	DeleteBackupBefore(ctx context.Context, beforeTS Timestamp) (CommandID, error)
+	DeleteBackupBefore(ctx context.Context, beforeTS Timestamp, options DeleteBackupBeforeOptions) (CommandID, error)
 
 	DeleteOplogRange(ctx context.Context, until Timestamp) (CommandID, error)
 

sdk/util.go

@@ -14,20 +14,13 @@ import (
 	"github.com/percona/percona-backup-mongodb/pbm/topo"
 )
 
-var errMissedClusterTime = errors.New("missed cluster time")
-
-func ParseBackupType(s string) BackupType {
-	switch s {
-	case
-		string(PhysicalBackup),
-		string(ExternalBackup),
-		string(IncrementalBackup),
-		string(LogicalBackup),
-		string(SelectiveBackup):
-		return BackupType(s)
-	}
+var (
+	errMissedClusterTime       = errors.New("missed cluster time")
+	errInvalidDeleteBackupType = backup.ErrInvalidDeleteBackupType
+)
 
-	return ""
+func ParseDeleteBackupType(s string) (BackupType, error) {
+	return backup.ParseDeleteBackupType(s)
 }
 
 func IsHeartbeatStale(clusterTime, other Timestamp) bool {