Merge pull request #1313 from percona/main

Release 2.14.0

Author: sandraromanchenko

e2e-tests/pkg/pbm/pbm_ctl.go

@@ -248,7 +248,7 @@ func (c *Ctl) waitForRestore(rinlist string, waitFor time.Duration) error {
 
 // Restore starts restore and returns the name of op
 func (c *Ctl) Restore(bcpName string, options []string) (string, error) {
-	command := append([]string{"pbm", "restore", bcpName, "-o", "json"}, options...)
+	command := append([]string{"pbm", "restore", bcpName, "-o", "json", "--yes"}, options...)
 	o, err := c.RunCmd(command...)
 	if err != nil {
 		return "", errors.Wrap(err, "run meta")
@@ -275,12 +275,12 @@ func (c *Ctl) ReplayOplog(a, b time.Time) error {
 }
 
 func (c *Ctl) PITRestore(t time.Time) error {
-	_, err := c.RunCmd("pbm", "restore", "--time", t.Format("2006-01-02T15:04:05"))
+	_, err := c.RunCmd("pbm", "restore", "--time", t.Format("2006-01-02T15:04:05"), "--yes")
 	return err
 }
 
 func (c *Ctl) PITRestoreClusterTime(t, i uint32) error {
-	_, err := c.RunCmd("pbm", "restore", "--time", fmt.Sprintf("%d,%d", t, i))
+	_, err := c.RunCmd("pbm", "restore", "--time", fmt.Sprintf("%d,%d", t, i), "--yes")
 	return err
 }
 

e2e-tests/run-new-cluster

@@ -69,7 +69,7 @@ wait_noop
 pbm_run list
 
 desc 'Restore'
-pbm_run restore --time $PITR_Time
+pbm_run restore --time $PITR_Time --yes
 wait_restore
 pbm_run logs -t 35
 

pbm/backup/physical.go

@@ -557,7 +557,7 @@ func (b *Backup) uploadPhysical(
 			// maintain uncompressed size just for the files that have a disk footprint,
 			// backup meta might contains files which are unchanged from the previous
 			// inc/base backup
-			sizeUncompressed += f.Size
+			sizeUncompressed += f.StgSizeUncompressed
 		}
 	}
 
@@ -761,11 +761,12 @@ func writeFile(
 	}
 
 	return &File{
-		Name:    src.Name,
-		Size:    sz,
-		Fmode:   fstat.Mode(),
-		StgSize: finf.Size,
-		Off:     src.Off,
-		Len:     src.Len,
+		Name:                src.Name,
+		Size:                fstat.Size(),
+		Fmode:               fstat.Mode(),
+		StgSize:             finf.Size,
+		StgSizeUncompressed: sz,
+		Off:                 src.Off,
+		Len:                 src.Len,
 	}, nil
 }

pbm/backup/types.go

@@ -147,12 +147,13 @@ type Condition struct {
 }
 
 type File struct {
-	Name    string      `bson:"filename" json:"filename"`
-	Off     int64       `bson:"offset" json:"offset"` // offset for incremental backups
-	Len     int64       `bson:"length" json:"length"` // length of chunk after the offset
-	Size    int64       `bson:"fileSize" json:"fileSize"`
-	StgSize int64       `bson:"stgSize" json:"stgSize"`
-	Fmode   os.FileMode `bson:"fmode" json:"fmode"`
+	Name                string      `bson:"filename" json:"filename"`
+	Off                 int64       `bson:"offset" json:"offset"` // offset for incremental backups
+	Len                 int64       `bson:"length" json:"length"` // length of chunk after the offset
+	Size                int64       `bson:"fileSize" json:"fileSize"`
+	StgSize             int64       `bson:"stgSize" json:"stgSize"`
+	StgSizeUncompressed int64       `bson:"stgSizeUncompressed" json:"stgSizeUncompressed"`
+	Fmode               os.FileMode `bson:"fmode" json:"fmode"`
 }
 
 func (f File) String() string {