Merge pull request #1806 from FabianKramm/master

Show file system events for sync in debug

Author: FabianKramm

pkg/devspace/sync/evaluater.go

@@ -1,6 +1,7 @@
 package sync
 
 import (
+	"github.com/loft-sh/devspace/pkg/util/log"
 	"os"
 
 	"github.com/loft-sh/devspace/helper/remote"
@@ -36,7 +37,7 @@ func shouldRemoveRemote(relativePath string, s *Sync) bool {
 }
 
 // s.fileIndex needs to be locked before this function is called
-func shouldUpload(s *Sync, fileInformation *FileInformation) bool {
+func shouldUpload(s *Sync, fileInformation *FileInformation, log log.Logger) bool {
 	// Exclude if stat is nil
 	if fileInformation == nil {
 		return false
@@ -50,12 +51,14 @@ func shouldUpload(s *Sync, fileInformation *FileInformation) bool {
 
 	// Exclude local symlinks
 	if fileInformation.IsSymbolicLink {
+		log.Debugf("Don't upload %s because it is a symbolic link", fileInformation.Name)
 		return false
 	}
 
 	// Exclude changes on the exclude list
 	if s.ignoreMatcher != nil {
 		if s.ignoreMatcher.Matches(fileInformation.Name, fileInformation.IsDirectory) {
+			log.Debugf("Don't upload %s because it is excluded", fileInformation.Name)
 			return false
 		}
 	}
@@ -64,16 +67,19 @@ func shouldUpload(s *Sync, fileInformation *FileInformation) bool {
 	if s.fileIndex.fileMap[fileInformation.Name] != nil {
 		// Folder already exists, don't send change
 		if fileInformation.IsDirectory {
+			log.Debugf("Don't upload %s because directory already exists", fileInformation.Name)
 			return false
 		}
 
 		// Exclude symlinks
 		if s.fileIndex.fileMap[fileInformation.Name].IsSymbolicLink {
+			log.Debugf("Don't upload %s because it is a symbolic link", fileInformation.Name)
 			return false
 		}
 
 		// File did not change or was changed by downstream
 		if fileInformation.Mtime == s.fileIndex.fileMap[fileInformation.Name].Mtime && fileInformation.Size == s.fileIndex.fileMap[fileInformation.Name].Size {
+			log.Debugf("Don't upload %s because mtime and size have not changed", fileInformation.Name)
 			return false
 		}
 	}
@@ -141,7 +147,7 @@ func shouldRemoveLocal(absFilepath string, fileInformation *FileInformation, s *
 	// We don't delete the file if we haven't tracked it
 	if stat != nil && s.fileIndex.fileMap[fileInformation.Name] != nil {
 		if stat.IsDir() != s.fileIndex.fileMap[fileInformation.Name].IsDirectory || stat.IsDir() != fileInformation.IsDirectory {
-			s.log.Infof("Skip %s because stat returned unequal isdir with fileMap", absFilepath)
+			s.log.Debugf("Skip %s because stat returned unequal isdir with fileMap", absFilepath)
 			return false
 		}
 
@@ -153,7 +159,7 @@ func shouldRemoveLocal(absFilepath string, fileInformation *FileInformation, s *
 					return true
 				}
 
-				s.log.Infof("Skip %s because stat.ModTime() %d is greater than fileInformation.Mtime %d", absFilepath, stat.ModTime().Unix(), fileInformation.Mtime)
+				s.log.Debugf("Skip %s because stat.ModTime() %d is greater than fileInformation.Mtime %d", absFilepath, stat.ModTime().Unix(), fileInformation.Mtime)
 			} else {
 				// s.log.Infof("Skip %s because Mtime (%d and %d) or Size (%d and %d) is unequal between fileInformation and fileMap", absFilepath, fileInformation.Mtime, s.fileIndex.fileMap[fileInformation.Name].Mtime, fileInformation.Size, s.fileIndex.fileMap[fileInformation.Name].Size)
 				return true

pkg/devspace/sync/upstream.go

@@ -403,6 +403,8 @@ func (u *upstream) getFileInformationFromEvent(events []notify.EventInfo) ([]*Fi
 		if ok {
 			changes = append(changes, fileInfo)
 		} else {
+			u.sync.log.Debugf("Upstream - Event from filesystem for %s", event.Path())
+
 			// check if path is correct
 			fullPath := event.Path()
 			if !strings.HasPrefix(filepath.ToSlash(fullPath), filepath.ToSlash(u.sync.LocalPath)+"/") {
@@ -475,6 +477,7 @@ func (u *upstream) evaluateChange(relativePath, fullpath string) (*FileInformati
 				}
 			}
 		} else if err != nil {
+			u.sync.log.Debugf("Error in lstat %s: %v", fullpath, err)
 			return nil, nil
 		} else if stat == nil {
 			return nil, nil
@@ -489,7 +492,7 @@ func (u *upstream) evaluateChange(relativePath, fullpath string) (*FileInformati
 			IsDirectory:    stat.IsDir(),
 			IsSymbolicLink: stat.Mode()&os.ModeSymlink != 0,
 		}
-		if shouldUpload(u.sync, fileInfo) {
+		if shouldUpload(u.sync, fileInfo, u.sync.log) {
 			// New Create Task
 			return fileInfo, nil
 		}
@@ -669,7 +672,7 @@ func (u *upstream) ExecuteBatchCommand() error {
 func (u *upstream) updateUploadChanges(files []*FileInformation) []*FileInformation {
 	newChanges := make([]*FileInformation, 0, len(files))
 	for _, change := range files {
-		if shouldUpload(u.sync, change) {
+		if shouldUpload(u.sync, change, u.sync.log) {
 			newChanges = append(newChanges, change)
 		}
 	}