Merge pull request #18 from sarus-suite/fc-robust-mirror

Robust implementation of mirror, it skips scratch and only transfer metadata related to the RO podman store.

Author: fcruzcscs

common/rsync-mirror.go

@@ -6,7 +6,7 @@ import (
     "os/exec"
     "path/filepath"
 
-	log "github.com/sirupsen/logrus"
+    log "github.com/sirupsen/logrus"
 )
 
 // Mirror creates a writable mirror of srcDir in a temp directory.
@@ -15,7 +15,7 @@ import (
 //
 // Note: this requires the "rsync" binary to be installed and in PATH.
 func Mirror(srcDir string) (mirrorDir string, cleanup func() error, err error) {
-	log.Infof("Mirror: creating temp dir for %q", srcDir)
+    log.Infof("Mirror: creating temp dir for %q", srcDir)
 
     mp, err := os.MkdirTemp("", "rsync-mirror-")
     if err != nil {
@@ -27,12 +27,29 @@ func Mirror(srcDir string) (mirrorDir string, cleanup func() error, err error) {
     mirrorPath := filepath.Clean(mp) + string(os.PathSeparator)
     log.Infof("Mirror: rsync from %s to %s (no squash/)", srcPath, mirrorPath)
 
-    // Setup mirror but skip squash/ dir
-    cmd := exec.Command("rsync",
-        "-a",
-        "--exclude=squash/",
-        srcPath, mirrorPath,
-    )
+    // Define PodmanOverlay file and directory patterns for mirror
+    allowedPatterns := []string{
+        "overlay/***",
+        "overlay-containers/***",
+        "overlay-images/***",
+        "overlay-layers/***",
+        "storage.lock",
+        "userns.lock",
+    }
+
+    includePatterns := []string{}
+    for _, pattern := range allowedPatterns {
+        includePatterns = append(includePatterns, fmt.Sprintf("--include=%s", pattern))
+    }
+
+	rsyncArgs := append([]string{"-a"}, includePatterns...)
+    rsyncArgs = append(rsyncArgs, "--exclude=*", "--delete")
+
+    log.Infof("Mirror setup: rsync from %s to %s", srcPath, mirrorPath)
+    rsyncCmd := append(rsyncArgs, srcPath, mirrorPath)
+    log.Infof("  rsync args %v", rsyncCmd)
+    cmd := exec.Command("rsync", rsyncCmd...)
+
     if out, err2 := cmd.CombinedOutput(); err2 != nil {
         os.RemoveAll(mp)
         return "", nil, fmt.Errorf("Initial rsync failed: %v\n%s", err2, out)
@@ -57,13 +74,10 @@ func Mirror(srcDir string) (mirrorDir string, cleanup func() error, err error) {
             return fmt.Errorf("Failed to remove squash symlink: %w", err)
         }
 
-        log.Infof("Mirror-cleanup: rsync back from %s to %s (excluding squash/)", mirrorPath, srcPath)
-        cmdBack := exec.Command("rsync",
-            "-a",
-            "--exclude=squash/",
-            "--delete",
-            mirrorPath, srcPath,
-        )
+        log.Infof("Mirror-cleanup: rsync back from %s to %s", mirrorPath, srcPath)
+        rsyncCmd = append(rsyncArgs, mirrorPath, srcPath)
+        cmdBack := exec.Command("rsync", rsyncCmd...)
+
         if out, err2 := cmdBack.CombinedOutput(); err2 != nil {
             return fmt.Errorf("rsync back failed: %v\n%s", err2, out)
         }