FMWK-604-xdr-restore-handler

- fix reader and encoder initialization.

cmd/internal/app/asbackup.go

@@ -227,7 +227,7 @@ func (b *ASBackup) Run(ctx context.Context) error {
 			return fmt.Errorf("failed to xdr backup: %w", err)
 		}
 
-		printBackupReport(h.GetStats())
+		printBackupReport(reportHeaderBackupXDR, h.GetStats())
 	default:
 		// Running ordinary backup.
 		h, err := b.backupClient.Backup(ctx, b.backupConfig, b.writer, b.reader)
@@ -239,7 +239,7 @@ func (b *ASBackup) Run(ctx context.Context) error {
 			return fmt.Errorf("failed to backup: %w", err)
 		}
 
-		printBackupReport(h.GetStats())
+		printBackupReport(reportHeaderBackup, h.GetStats())
 	}
 
 	return nil

cmd/internal/app/asrestore.go

@@ -92,6 +92,8 @@ func (r *ASRestore) Run(ctx context.Context) error {
 
 	switch r.mode {
 	case models.RestoreModeASB:
+		r.restoreConfig.EncoderType = backup.EncoderTypeASB
+
 		h, err := r.backupClient.Restore(ctx, r.restoreConfig, r.reader)
 		if err != nil {
 			return fmt.Errorf("failed to start restore: %w", err)
@@ -101,24 +103,30 @@ func (r *ASRestore) Run(ctx context.Context) error {
 			return fmt.Errorf("failed to restore: %w", err)
 		}
 
-		printRestoreReport(h.GetStats())
+		printRestoreReport(reportHeaderRestore, h.GetStats())
 	case models.RestoreModeASBX:
-		h, err := r.backupClient.RestoreXDR(ctx, r.restoreConfig, r.xdrReader)
+		r.restoreConfig.EncoderType = backup.EncoderTypeASBX
+
+		hXdr, err := r.backupClient.RestoreXDR(ctx, r.restoreConfig, r.xdrReader)
 		if err != nil {
 			return fmt.Errorf("failed to start xdr restore: %w", err)
 		}
 
-		if err = h.Wait(ctx); err != nil {
+		if err = hXdr.Wait(ctx); err != nil {
 			return fmt.Errorf("failed to xdr restore: %w", err)
 		}
 
-		printRestoreReport(h.GetStats())
+		printRestoreReport(reportHeaderRestoreXDR, hXdr.GetStats())
 	case models.RestoreModeAuto:
+		r.restoreConfig.EncoderType = backup.EncoderTypeASB
+
 		h, err := r.backupClient.Restore(ctx, r.restoreConfig, r.reader)
 		if err != nil {
 			return fmt.Errorf("failed to start restore: %w", err)
 		}
 
+		r.restoreConfig.EncoderType = backup.EncoderTypeASBX
+
 		hXdr, err := r.backupClient.RestoreXDR(ctx, r.restoreConfig, r.xdrReader)
 		if err != nil {
 			return fmt.Errorf("failed to start xdr restore: %w", err)
@@ -132,8 +140,9 @@ func (r *ASRestore) Run(ctx context.Context) error {
 			return fmt.Errorf("failed to xdr restore: %w", err)
 		}
 
-		printRestoreReport(h.GetStats())
-		printRestoreReport(hXdr.GetStats())
+		printRestoreReport(reportHeaderRestore, h.GetStats())
+		fmt.Println() // For pretty print.
+		printRestoreReport(reportHeaderRestoreXDR, hXdr.GetStats())
 	default:
 		return fmt.Errorf("invalid mode: %s", r.mode)
 	}

cmd/internal/app/configs.go

@@ -173,7 +173,6 @@ func mapRestoreConfig(params *ASRestoreParams) *backup.RestoreConfig {
 		params.RestoreParams.RetryBaseTimeout,
 		params.RestoreParams.RetryMultiplier, params.RestoreParams.RetryMaxRetries,
 	)
-	c.EncoderType = backup.EncoderTypeASB
 
 	return c
 }

cmd/internal/app/reports.go

@@ -21,8 +21,15 @@ import (
 	bModels "github.com/aerospike/backup-go/models"
 )
 
-func printBackupReport(stats *bModels.BackupStats) {
-	fmt.Println("Backup Report")
+const (
+	reportHeaderBackup     = "Backup Report"
+	reportHeaderBackupXDR  = "XDR Backup Report"
+	reportHeaderRestore    = "Restore Report"
+	reportHeaderRestoreXDR = "XDR Restore Report"
+)
+
+func printBackupReport(header string, stats *bModels.BackupStats) {
+	fmt.Println(header)
 	fmt.Println("--------------")
 	fmt.Printf("Start Time:           %s\n", stats.StartTime.Format(time.RFC1123))
 	fmt.Printf("Duration:             %s\n", stats.GetDuration())
@@ -35,8 +42,8 @@ func printBackupReport(stats *bModels.BackupStats) {
 	fmt.Printf("Files Written:        %d\n", stats.GetFileCount())
 }
 
-func printRestoreReport(stats *bModels.RestoreStats) {
-	fmt.Println("Restore Report")
+func printRestoreReport(header string, stats *bModels.RestoreStats) {
+	fmt.Println(header)
 	fmt.Println("--------------")
 	fmt.Printf("Start Time:           %s\n", stats.StartTime.Format(time.RFC1123))
 	fmt.Printf("Duration:             %s\n", stats.GetDuration())

io/aws/s3/reader.go

@@ -101,11 +101,12 @@ func (r *Reader) StreamFiles(
 		switch r.isDir {
 		case true:
 			path = cleanPath(path)
-
-			err := r.checkRestoreDirectory(ctx, path)
-			if err != nil {
-				errorsCh <- err
-				return
+			if !r.skipDirCheck {
+				err := r.checkRestoreDirectory(ctx, path)
+				if err != nil {
+					errorsCh <- err
+					return
+				}
 			}
 
 			r.streamDirectory(ctx, path, readersCh, errorsCh)

io/azure/blob/reader.go

@@ -95,11 +95,12 @@ func (r *Reader) StreamFiles(
 		switch r.isDir {
 		case true:
 			path = cleanPath(path)
-
-			err := r.checkRestoreDirectory(ctx, path)
-			if err != nil {
-				errorsCh <- err
-				return
+			if !r.skipDirCheck {
+				err := r.checkRestoreDirectory(ctx, path)
+				if err != nil {
+					errorsCh <- err
+					return
+				}
 			}
 
 			r.streamDirectory(ctx, path, readersCh, errorsCh)

io/gcp/storage/reader.go

@@ -96,11 +96,12 @@ func (r *Reader) StreamFiles(
 		switch r.isDir {
 		case true:
 			path = cleanPath(path)
-
-			err := r.checkRestoreDirectory(ctx, path)
-			if err != nil {
-				errorsCh <- err
-				return
+			if !r.skipDirCheck {
+				err := r.checkRestoreDirectory(ctx, path)
+				if err != nil {
+					errorsCh <- err
+					return
+				}
 			}
 
 			r.streamDirectory(ctx, path, readersCh, errorsCh)

io/local/reader.go

@@ -72,10 +72,12 @@ func (r *Reader) StreamFiles(
 		// If it is a folder, open and return.
 		switch r.isDir {
 		case true:
-			err := r.checkRestoreDirectory(path)
-			if err != nil {
-				errorsCh <- err
-				return
+			if !r.skipDirCheck {
+				err := r.checkRestoreDirectory(path)
+				if err != nil {
+					errorsCh <- err
+					return
+				}
 			}
 
 			r.streamDirectory(ctx, path, readersCh, errorsCh)