log debug message if failed to remove

Author: Eslam-Nawara

pkg/flist/cleanup.go

@@ -139,6 +139,7 @@ func (f *flistModule) cleanUnusedMounts() error {
 		}
 
 		if err := os.Remove(path); err != nil {
+			log.Debug().Msgf("failed to remove path, trying to forcibly clean up : %+v", path)
 			if err := f.forceUnmountAndRemove(path); err != nil {
 				log.Error().Err(err).Msgf("failed to clean mountpoint %s", path)
 			}
@@ -149,7 +150,6 @@ func (f *flistModule) cleanUnusedMounts() error {
 }
 
 func (f *flistModule) forceUnmountAndRemove(path string) error {
-	log.Debug().Msgf("trying to forcibly clean up : %+v", path)
 	// Try normal unmount first
 	err := f.system.Unmount(path, 0)
 	if err != nil {
@@ -158,14 +158,12 @@ func (f *flistModule) forceUnmountAndRemove(path string) error {
 		// Try lazy unmount (MNT_DETACH)
 		err = syscall.Unmount(path, syscall.MNT_DETACH)
 		if err != nil {
-			log.Error().Err(err).Msgf("lazy unmount also failed for %s", path)
-			return err
+			return errors.Wrapf(err, "lazy unmount also failed for %s", path)
 		}
 	}
 	// Now try to remove the directory
 	if err := os.RemoveAll(path); err != nil {
-		log.Error().Err(err).Msgf("failed to remove mountpoint %s", path)
-		return err
+		return errors.Wrapf(err, "failed to remove mountpoint %s", path)
 	}
 	return nil
 }