Expand backup meta with backup's size on RS

Author: boris-ilijic

cmd/pbm/backup.go

@@ -340,6 +340,8 @@ type bcpReplDesc struct {
 	Status             defs.Status         `json:"status" yaml:"status"`
 	Node               string              `json:"node" yaml:"node"`
 	Files              []backup.File       `json:"files,omitempty" yaml:"-"`
+	Size               int64               `json:"size" yaml:"-"`
+	HSize              string              `json:"size_h" yaml:"size_h"`
 	LastWriteTS        int64               `json:"last_write_ts" yaml:"-"`
 	LastTransitionTS   int64               `json:"last_transition_ts" yaml:"-"`
 	LastWriteTime      string              `json:"last_write_time" yaml:"last_write_time"`
@@ -442,6 +444,8 @@ func describeBackup(
 			IsConfigSvr:        r.IsConfigSvr,
 			IsConfigShard:      r.IsConfigShard,
 			Status:             r.Status,
+			Size:               r.Size,
+			HSize:              byteCountIEC(r.Size),
 			LastWriteTS:        int64(r.LastWriteTS.T),
 			LastTransitionTS:   r.LastTransitionTS,
 			LastWriteTime:      time.Unix(int64(r.LastWriteTS.T), 0).UTC().Format(time.RFC3339),

pbm/backup/physical.go

@@ -526,10 +526,15 @@ func (b *Backup) uploadPhysical(
 	}
 	l.Info("uploaded: %q %s", filelistPath, storage.PrettySize(flSize))
 
-	err = IncBackupSize(ctx, b.leadConn, bcp.Name, size+flSize)
+	totalSize := size + flSize
+	err = IncBackupSize(ctx, b.leadConn, bcp.Name, totalSize)
 	if err != nil {
 		return errors.Wrap(err, "inc backup size")
 	}
+	err = SetBackupSizeForRS(ctx, b.leadConn, bcp.Name, rsMeta.Name, totalSize)
+	if err != nil {
+		return errors.Wrap(err, "set RS backup size")
+	}
 
 	return nil
 }

pbm/backup/query.go

@@ -219,6 +219,7 @@ func ChangeRSState(conn connect.Client, bcpName, rsName string, s defs.Status, m
 	return err
 }
 
+// IncBackupSize increments total backup size.
 func IncBackupSize(ctx context.Context, conn connect.Client, bcpName string, size int64) error {
 	_, err := conn.BcpCollection().UpdateOne(ctx,
 		bson.D{{"name", bcpName}},
@@ -227,6 +228,22 @@ func IncBackupSize(ctx context.Context, conn connect.Client, bcpName string, siz
 	return err
 }
 
+// SetBackupSizeForRS sets size of backup for specified RS.
+func SetBackupSizeForRS(
+	ctx context.Context,
+	conn connect.Client,
+	bcpName,
+	rsName string,
+	size int64,
+) error {
+	_, err := conn.BcpCollection().UpdateOne(
+		ctx,
+		bson.D{{"name", bcpName}, {"replsets.name", rsName}},
+		bson.D{{"$set", bson.M{"replsets.$.size": size}}})
+
+	return err
+}
+
 func SetRSLastWrite(conn connect.Client, bcpName, rsName string, ts primitive.Timestamp) error {
 	_, err := conn.BcpCollection().UpdateOne(
 		context.Background(),

pbm/backup/types.go

@@ -117,6 +117,7 @@ type BackupReplset struct {
 	OplogName        string              `bson:"oplog_name,omitempty" json:"oplog_name,omitempty"`
 	StartTS          int64               `bson:"start_ts" json:"start_ts"`
 	Status           defs.Status         `bson:"status" json:"status"`
+	Size             int64               `bson:"size" json:"size"`
 	IsConfigSvr      *bool               `bson:"iscs,omitempty" json:"iscs,omitempty"`
 	IsConfigShard    *bool               `bson:"configshard,omitempty" json:"configshard,omitempty"`
 	LastTransitionTS int64               `bson:"last_transition_ts" json:"last_transition_ts"`