Fix reviewdog suggestions

Author: boris-ilijic

pbm/restore/physical.go

@@ -242,7 +242,7 @@ func (r *PhysRestore) close(noerr, cleanup bool) {
 		}
 
 		if cStatus == defs.StatusError {
-			err := r.migrateFromFallbackDirToDbDir()
+			err := r.migrateFromFallbackDirToDBDir()
 			if err != nil {
 				r.log.Error("migrate from fallback dir: %v", err)
 			}
@@ -349,17 +349,17 @@ func (r *PhysRestore) flush(ctx context.Context) error {
 		}
 	}
 
-	err = r.migrateDbDirToFallbackDir()
+	err = r.migrateDBDirToFallbackDir()
 	if err != nil {
 		return errors.Wrapf(err, "move files to fallback path")
 	}
 
 	return nil
 }
 
-// migrateDbDirToFallbackDir moves content of dbPath dir into fallback dir.
+// migrateDBDirToFallbackDir moves content of dbPath dir into fallback dir.
 // It also removes old fallback dir, and creates new with the same perms.
-func (r *PhysRestore) migrateDbDirToFallbackDir() error {
+func (r *PhysRestore) migrateDBDirToFallbackDir() error {
 	dbpath := filepath.Clean(r.dbpath)
 	fallbackPath := filepath.Join(dbpath, fallbackDir)
 	r.log.Debug("dbpath: %s, fallbackPath: %s", dbpath, fallbackPath)
@@ -388,19 +388,21 @@ func (r *PhysRestore) migrateDbDirToFallbackDir() error {
 	return nil
 }
 
-// migrateFromFallbackDirToDbDir wipe up dbpath dir and
+// migrateFromFallbackDirToDBDir wipe up dbpath dir and
 // moves all content from fallback path.
-func (r *PhysRestore) migrateFromFallbackDirToDbDir() error {
+func (r *PhysRestore) migrateFromFallbackDirToDBDir() error {
 	r.log.Debug("clean-up dbpath")
 	err := removeAll(r.dbpath, []string{fallbackDir}, r.log)
 	if err != nil {
 		r.log.Error("flush dbpath %s: %v", r.dbpath, err)
+		return errors.Wrap(err, "remove all from dbpath")
 	}
 
 	r.log.Info("move data files from %s to %s", fallbackDir, r.dbpath)
 	err = r.moveFromFallback()
 	if err != nil {
 		r.log.Error("moving from %s: %v", fallbackDir, err)
+		return errors.Wrapf(err, "move from %s", fallbackDir)
 	}
 
 	return nil
@@ -2483,13 +2485,15 @@ func (r *PhysRestore) MarkFailed(meta *RestoreMeta, e error) {
 	// (in `toState` method).
 	// Here we are not aware of partlyDone etc so leave it to the `toState`.
 	if r.checkForRSLevelErr() {
+		r.log.Debug("set error on rs level")
 		serr := util.RetryableWrite(r.stg,
 			r.syncPathRS+"."+string(defs.StatusError), errStatus(e))
 		if serr != nil {
 			r.log.Error("MarkFailed: write replset error state `%v`: %v", e, serr)
 		}
 	}
 	if r.nodeInfo.IsLeader() && r.checkForClusterLevelErr() {
+		r.log.Debug("set error on cluster level")
 		serr := util.RetryableWrite(r.stg,
 			r.syncPathCluster+"."+string(defs.StatusError), errStatus(e))
 		if serr != nil {

pbm/restore/physical_test.go

@@ -22,11 +22,11 @@ func TestMoveAll(t *testing.T) {
 		for i, file := range testFiles {
 			_ = os.WriteFile(
 				filepath.Join(tempSrc, file),
-				[]byte(fmt.Sprintf("test content %d", i)), 0644)
+				[]byte(fmt.Sprintf("test content %d", i)), 0o644)
 		}
 
 		subDir := filepath.Join(tempSrc, "subdir")
-		_ = os.Mkdir(subDir, 0755)
+		_ = os.Mkdir(subDir, 0o755)
 
 		err := moveAll(tempSrc, tempDst, nil, log.DiscardLogger.NewDefaultEvent())
 		if err != nil {
@@ -63,11 +63,11 @@ func TestMoveAll(t *testing.T) {
 		for i, file := range testFiles {
 			_ = os.WriteFile(
 				filepath.Join(tempSrc, file),
-				[]byte(fmt.Sprintf("test content %d", i)), 0644)
+				[]byte(fmt.Sprintf("test content %d", i)), 0o644)
 		}
 
-		_ = os.Mkdir(filepath.Join(tempSrc, "ignore_dir"), 0755)
-		_ = os.Mkdir(filepath.Join(tempSrc, "normal_dir"), 0755)
+		_ = os.Mkdir(filepath.Join(tempSrc, "ignore_dir"), 0o755)
+		_ = os.Mkdir(filepath.Join(tempSrc, "normal_dir"), 0o755)
 
 		toIgnore := []string{"ignore_me", "ignore_dir"}
 
@@ -122,13 +122,12 @@ func TestMoveAll(t *testing.T) {
 		tempDst, _ := os.MkdirTemp("", "dst")
 		defer os.RemoveAll(tempDst)
 
-		_ = os.Chmod(tempDst, 0500)   // read-only
-		defer os.Chmod(tempDst, 0700) // Restore permissions for cleanup
+		_ = os.Chmod(tempDst, 0o400)
 
 		// Create test file in source
 		_ = os.WriteFile(
 			filepath.Join(tempSrc, "test"),
-			[]byte("test content"), 0644)
+			[]byte("test content"), 0o644)
 
 		err := moveAll(tempSrc, tempDst, nil, log.DiscardLogger.NewDefaultEvent())
 		if err == nil {