Adding backup stats to copy function (#370)

* STash conflicts * New log format Using log.Debug().Print() * Fix log import and const comment
kanisterio · Oct 19, 2019 · cf8b227 · cf8b227
1 parent 3569bf5
commit cf8b227
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pkg/function/backup_data.go b/pkg/function/backup_data.go
@@ -50,6 +50,10 @@ const (
 	BackupDataOutputBackupID = "backupID"
 	// BackupDataOutputBackupTag is the key used for returning backupTag output
 	BackupDataOutputBackupTag = "backupTag"
+	// BackupDataOutputBackupFileCount is the key used for returning backup file count
+	BackupDataOutputBackupFileCount = "fileCount"
+	// BackupDataOutputBackupSize is the key used for returning backup size
+	BackupDataOutputBackupSize = "size"
 )
 
 func init() {
@@ -117,10 +121,10 @@ func (*backupDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args m
 		return nil, errors.Wrapf(err, "Failed to backup data")
 	}
 	output := map[string]interface{}{
-		BackupDataOutputBackupID:       backupOutputs.backupID,
-		BackupDataOutputBackupTag:      backupOutputs.backupTag,
-		BackupDataStatsOutputFileCount: backupOutputs.fileCount,
-		BackupDataStatsOutputSize:      backupOutputs.backupSize,
+		BackupDataOutputBackupID:        backupOutputs.backupID,
+		BackupDataOutputBackupTag:       backupOutputs.backupTag,
+		BackupDataOutputBackupFileCount: backupOutputs.fileCount,
+		BackupDataOutputBackupSize:      backupOutputs.backupSize,
 	}
 	return output, nil
 }

diff --git a/pkg/function/copy_volume_data.go b/pkg/function/copy_volume_data.go
@@ -27,6 +27,7 @@ import (
 	kanister "github.com/kanisterio/kanister/pkg"
 	"github.com/kanisterio/kanister/pkg/format"
 	"github.com/kanisterio/kanister/pkg/kube"
+	"github.com/kanisterio/kanister/pkg/log"
 	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/kanisterio/kanister/pkg/restic"
 )
@@ -44,6 +45,8 @@ const (
 	CopyVolumeDataEncryptionKeyArg             = "encryptionKey"
 	CopyVolumeDataOutputBackupTag              = "backupTag"
 	CopyVolumeDataPodOverrideArg               = "podOverride"
+	CopyVolumeDataOutputBackupFileCount        = "fileCount"
+	CopyVolumeDataOutputBackupSize             = "size"
 )
 
 func init() {
@@ -110,11 +113,17 @@ func copyVolumeDataPodFunc(cli kubernetes.Interface, tp param.TemplateParams, na
 		if backupID == "" {
 			return nil, errors.New("Failed to parse the backup ID from logs")
 		}
+		fileCount, backupSize := restic.SnapshotStatsFromBackupLog(stdout)
+		if backupSize == "" {
+			log.Debug().Print("Could not parse backup stats from backup log")
+		}
 		return map[string]interface{}{
 				CopyVolumeDataOutputBackupID:               backupID,
 				CopyVolumeDataOutputBackupRoot:             mountPoint,
 				CopyVolumeDataOutputBackupArtifactLocation: targetPath,
 				CopyVolumeDataOutputBackupTag:              backupTag,
+				CopyVolumeDataOutputBackupFileCount:        fileCount,
+				CopyVolumeDataOutputBackupSize:             backupSize,
 			},
 			nil
 	}