feat(restore): cleanup DM device and endpoint for v2 volume increment…

…al restore longhorn/longhorn-6613 Signed-off-by: Chin-Ya Huang <[email protected]>
longhorn · Aug 1, 2024 · 23f54c1 · 23f54c1
1 parent 6f78e0e
commit 23f54c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/deltablock.go b/deltablock.go
@@ -110,7 +110,7 @@ type DeltaBlockBackupOperations interface {
 }
 
 type DeltaRestoreOperations interface {
-	OpenVolumeDev(volDevName string) (*os.File, string, error)
+	OpenVolumeDev(volDevName string, dmDeviceAndEndpointCleanupRequired bool) (*os.File, string, error)
 	CloseVolumeDev(volDev *os.File) error
 	UpdateRestoreStatus(snapshot string, restoreProgress int, err error)
 	Stop()
@@ -735,7 +735,7 @@ func RestoreDeltaBlockBackup(ctx context.Context, config *DeltaRestoreConfig) er
 		return fmt.Errorf("invalid volume size %v", vol.Size)
 	}
 
-	volDev, volDevPath, err := deltaOps.OpenVolumeDev(volDevName)
+	volDev, volDevPath, err := deltaOps.OpenVolumeDev(volDevName, false)
 	if err != nil {
 		return errors.Wrapf(err, "failed to open volume device %v", volDevName)
 	}
@@ -894,7 +894,7 @@ func RestoreDeltaBlockBackupIncrementally(ctx context.Context, config *DeltaRest
 		}
 	}
 
-	volDev, volDevPath, err := deltaOps.OpenVolumeDev(volDevName)
+	volDev, volDevPath, err := deltaOps.OpenVolumeDev(volDevName, true)
 	if err != nil {
 		return errors.Wrapf(err, "failed to open volume device %v", volDevName)
 	}

diff --git a/test/backup_test.go b/test/backup_test.go
@@ -70,7 +70,7 @@ type RawFileVolume struct {
 	stopChan        chan struct{}
 }
 
-func (r *RawFileVolume) OpenVolumeDev(volDevName string) (*os.File, string, error) {
+func (r *RawFileVolume) OpenVolumeDev(volDevName string, dmDeviceAndEndpointCleanupRequired bool) (*os.File, string, error) {
 	if _, err := os.Stat(volDevName); err == nil {
 		logrus.WithError(err).Warnf("File %s for the restore exists, will remove and re-create it", volDevName)
 		if err := os.RemoveAll(volDevName); err != nil {