Add moveAll helper

Author: boris-ilijic

pbm/restore/physical.go

@@ -13,6 +13,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -2349,6 +2350,32 @@ func (r *PhysRestore) MarkFailed(meta *RestoreMeta, e error, markCluster bool) {
 	}
 }
 
+// moveAll moves fromDir content (files and dirs) to toDir content.
+// It ignores all files/dirs specified within toIgnore slice.
+func moveAll(fromDir, toDir string, toIgnore []string, l log.LogEvent) error {
+	d, err := os.Open(fromDir)
+	if err != nil {
+		return errors.Wrap(err, "open dir")
+	}
+	defer d.Close()
+
+	names, err := d.Readdirnames(-1)
+	if err != nil {
+		return errors.Wrap(err, "read file names")
+	}
+	for _, n := range names {
+		if slices.Contains(toIgnore, n) {
+			continue
+		}
+		err = os.Rename(filepath.Join(fromDir, n), filepath.Join(toDir, n))
+		if err != nil {
+			return errors.Wrapf(err, "move %s", n)
+		}
+		l.Debug("move to %s dir: %s", toDir, n)
+	}
+	return nil
+}
+
 func removeAll(dir string, l log.LogEvent) error {
 	d, err := os.Open(dir)
 	if err != nil {
@@ -2361,7 +2388,7 @@ func removeAll(dir string, l log.LogEvent) error {
 		return errors.Wrap(err, "read file names")
 	}
 	for _, n := range names {
-		if n == internalMongodLog {
+		if n == internalMongodLog || n == fallbackDir {
 			continue
 		}
 		err = os.RemoveAll(filepath.Join(dir, n))

pbm/restore/physical_test.go

@@ -0,0 +1,142 @@
+package restore
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/percona/percona-backup-mongodb/pbm/log"
+)
+
+func TestMoveAll(t *testing.T) {
+	t.Run("move all files and dir", func(t *testing.T) {
+		tempSrc, _ := os.MkdirTemp("", "src")
+		defer os.RemoveAll(tempSrc)
+
+		tempDst, _ := os.MkdirTemp("", "dst")
+		defer os.RemoveAll(tempDst)
+
+		testFiles := []string{"file1", "file2", "file3"}
+		for i, file := range testFiles {
+			_ = os.WriteFile(
+				filepath.Join(tempSrc, file),
+				[]byte(fmt.Sprintf("test content %d", i)), 0644)
+		}
+
+		subDir := filepath.Join(tempSrc, "subdir")
+		_ = os.Mkdir(subDir, 0755)
+
+		err := moveAll(tempSrc, tempDst, nil, log.DiscardLogger.NewDefaultEvent())
+		if err != nil {
+			t.Fatalf("moveAll failed: %v", err)
+		}
+
+		// files are moved
+		for _, file := range testFiles {
+			if _, err := os.Stat(filepath.Join(tempDst, file)); os.IsNotExist(err) {
+				t.Errorf("file %s not found in destination directory", file)
+			}
+			if _, err := os.Stat(filepath.Join(tempSrc, file)); !os.IsNotExist(err) {
+				t.Errorf("file %s still exists in source directory", file)
+			}
+		}
+
+		// subdir is moved
+		if _, err := os.Stat(filepath.Join(tempDst, "subdir")); os.IsNotExist(err) {
+			t.Errorf("subdirectory not found in destination directory")
+		}
+		if _, err := os.Stat(filepath.Join(tempSrc, "subdir")); !os.IsNotExist(err) {
+			t.Errorf("subdirectory still exists in source directory")
+		}
+	})
+
+	t.Run("ignore files and dirs", func(t *testing.T) {
+		tempSrc, _ := os.MkdirTemp("", "src")
+		defer os.RemoveAll(tempSrc)
+
+		tempDst, _ := os.MkdirTemp("", "dst")
+		defer os.RemoveAll(tempDst)
+
+		testFiles := []string{"file1", "file2", "ignore_me"}
+		for i, file := range testFiles {
+			_ = os.WriteFile(
+				filepath.Join(tempSrc, file),
+				[]byte(fmt.Sprintf("test content %d", i)), 0644)
+		}
+
+		_ = os.Mkdir(filepath.Join(tempSrc, "ignore_dir"), 0755)
+		_ = os.Mkdir(filepath.Join(tempSrc, "normal_dir"), 0755)
+
+		toIgnore := []string{"ignore_me", "ignore_dir"}
+
+		err := moveAll(tempSrc, tempDst, toIgnore, log.DiscardLogger.NewDefaultEvent())
+		if err != nil {
+			t.Fatalf("moveAll failed: %v", err)
+		}
+
+		// non-ignored files are moved
+		movedFiles := []string{"file1", "file2"}
+		for _, file := range movedFiles {
+			if _, err := os.Stat(filepath.Join(tempDst, file)); os.IsNotExist(err) {
+				t.Errorf("file %s not found in destination directory", file)
+			}
+		}
+
+		// ignored items remain in source
+		for _, item := range toIgnore {
+			if _, err := os.Stat(filepath.Join(tempSrc, item)); os.IsNotExist(err) {
+				t.Errorf("ignored item %s not found in source directory", item)
+			}
+			if _, err := os.Stat(filepath.Join(tempDst, item)); !os.IsNotExist(err) {
+				t.Errorf("ignored item %s was moved to destination directory", item)
+			}
+		}
+
+		// non-ignored directory is moved
+		if _, err := os.Stat(filepath.Join(tempDst, "normal_dir")); os.IsNotExist(err) {
+			t.Errorf("normal directory not found in destination directory")
+		}
+	})
+
+	t.Run("source dir doesn't exist", func(t *testing.T) {
+		tempDst, _ := os.MkdirTemp("", "dst")
+		defer os.RemoveAll(tempDst)
+
+		nonExistentDir := "/path/not/exist"
+
+		err := moveAll(nonExistentDir, tempDst, nil, log.DiscardLogger.NewDefaultEvent())
+		if err == nil {
+			t.Fatal("want error")
+		}
+		if !strings.Contains(err.Error(), "open dir") {
+			t.Errorf("want:'open dir', got:%v", err)
+		}
+	})
+
+	t.Run("write permission error", func(t *testing.T) {
+		tempSrc, _ := os.MkdirTemp("", "src")
+		defer os.RemoveAll(tempSrc)
+
+		tempDst, _ := os.MkdirTemp("", "dst")
+		defer os.RemoveAll(tempDst)
+
+		_ = os.Chmod(tempDst, 0500)   // read-only
+		defer os.Chmod(tempDst, 0700) // Restore permissions for cleanup
+
+		// Create test file in source
+		_ = os.WriteFile(
+			filepath.Join(tempSrc, "test"),
+			[]byte("test content"), 0644)
+
+		err := moveAll(tempSrc, tempDst, nil, log.DiscardLogger.NewDefaultEvent())
+		if err == nil {
+			t.Fatal("want perm error")
+		}
+
+		if !strings.Contains(err.Error(), "move test") {
+			t.Errorf("want:'move test', got:%v", err)
+		}
+	})
+}