backup/restore: update arguments due to the changes in apis

Longhorn 7581 Signed-off-by: Derek Su <derek.su@suse.com>
longhorn · Jan 10, 2024 · deb8b18 · deb8b18
1 parent 0490dee
commit deb8b18
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/app/cmd/restore_to_file.go b/app/cmd/restore_to_file.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -86,7 +87,7 @@ func restore(url string, concurrentLimit int) error {
 		ConcurrentLimit: int32(concurrentLimit),
 	}
 
-	if err := backupstore.RestoreDeltaBlockBackup(config); err != nil {
+	if err := backupstore.RestoreDeltaBlockBackup(context.Background(), config); err != nil {
 		return err
 	}
 

diff --git a/pkg/backup/main.go b/pkg/backup/main.go
@@ -1,6 +1,7 @@
 package backup
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -169,26 +170,28 @@ func DoBackupRestore(backupURL string, toFile string, concurrentLimit int, resto
 
 	log.Infof("Start restoring from %v into snapshot %v", backupURL, toFile)
 
-	return backupstore.RestoreDeltaBlockBackup(&backupstore.DeltaRestoreConfig{
-		BackupURL:       backupURL,
-		DeltaOps:        restoreObj,
-		Filename:        toFile,
-		ConcurrentLimit: int32(concurrentLimit),
-	})
+	return backupstore.RestoreDeltaBlockBackup(context.Background(),
+		&backupstore.DeltaRestoreConfig{
+			BackupURL:       backupURL,
+			DeltaOps:        restoreObj,
+			Filename:        toFile,
+			ConcurrentLimit: int32(concurrentLimit),
+		})
 }
 
 func DoBackupRestoreIncrementally(url string, deltaFile string, lastRestored string, concurrentLimit int, restoreObj *replica.RestoreStatus) error {
 	backupURL := util.UnescapeURL(url)
 
 	log.Infof("Start incremental restoring from %v into delta file %v", backupURL, deltaFile)
 
-	return backupstore.RestoreDeltaBlockBackupIncrementally(&backupstore.DeltaRestoreConfig{
-		BackupURL:       backupURL,
-		DeltaOps:        restoreObj,
-		LastBackupName:  lastRestored,
-		Filename:        deltaFile,
-		ConcurrentLimit: int32(concurrentLimit),
-	})
+	return backupstore.RestoreDeltaBlockBackupIncrementally(context.Background(),
+		&backupstore.DeltaRestoreConfig{
+			BackupURL:       backupURL,
+			DeltaOps:        restoreObj,
+			LastBackupName:  lastRestored,
+			Filename:        deltaFile,
+			ConcurrentLimit: int32(concurrentLimit),
+		})
 }
 
 func CreateNewSnapshotMetafile(file string) error {