Merge pull request #4 from sarus-suite/rsync-mirror

Rsync mirror

Author: fcruzcscs

cmd/migration.go

@@ -212,13 +212,13 @@ func setupSrcStore(cfg common.Config) (storage.Store, func(), error) {
 func setupScratchStore(cfg *common.Config) (storage.Store, func(), error) {
 	sublog := log.WithField("fn", "setupScratchStore")
 
-	// we mirror the RoStoragePath to hide the fact that might be a networkedFS
+	// we copy mirror the RoStoragePath to hide the fact that might be a networkedFS
 	mirror, mirrorCleanup, err := common.Mirror(cfg.RoStoragePath)
 	if err != nil {
-		sublog.Debug("Failed to mount mirror: %v", err)
+		sublog.Debug("Failed to copy mirror: %v", err)
 		return nil, nil, err
 	}
-	sublog.Infof("Mounted mirror of %s at %s", cfg.RoStoragePath, mirror)
+	sublog.Infof("Copy mirror of %s at %s", cfg.RoStoragePath, mirror)
 	originalPath := cfg.RoStoragePath
 	cfg.RoStoragePath = mirror
 

cmd/rmi.go

@@ -24,6 +24,16 @@ func RunRmi(cfg common.Config) error {
 	log.Infof("Starting removal of image: %s", cfg.Image)
 	log.Debugf("Podman Root: %s, Read-only Storage Path: %s", cfg.PodmanRoot, cfg.RoStoragePath)
 
+    // we copy mirror the RoStoragePath to hide the fact that might be a networkedFS
+    mirror, mirrorCleanup, err := common.Mirror(cfg.RoStoragePath)
+    if err != nil {
+        log.Debug("Failed to copy mirror: %v", err)
+        return err
+    }
+    log.Infof("Copy mirror of %s at %s", cfg.RoStoragePath, mirror)
+    originalPath := cfg.RoStoragePath
+    cfg.RoStoragePath = mirror
+
 	storeRun, cleanupRun := common.MustTempDir("rmi-RoStore-*")
 	log.Infof("Opened store with: %s, %s", cfg.RoStoragePath, storeRun)
 	store, err := storage.GetStore(storage.StoreOptions{
@@ -35,8 +45,10 @@ func RunRmi(cfg common.Config) error {
 		panic(fmt.Errorf("Error init overlay store: %w", err))
 	}
 	defer func() {
+		cfg.RoStoragePath = originalPath
 		store.Shutdown(false)
 		cleanupRun()
+		mirrorCleanup()
 		log.Info("Teardown of store completed")
 	}()