Check if find command was correctly executed (#326)

Author: FabianKramm

pkg/devspace/sync/downstream.go

@@ -101,19 +101,13 @@ func (d *downstream) mainLoop() error {
 
 	for {
 		removeFiles := d.cloneFileMap()
-		removeFilesLen := len(removeFiles)
 
 		// Check for changes remotely
 		createFiles, err := d.collectChanges(removeFiles)
 		if err != nil {
 			return errors.Trace(err)
 		}
 
-		// There is an issue with collect changes, hence we return an error
-		if removeFilesLen == len(removeFiles) {
-			return errors.New("Sync cannot execute find command remotely")
-		}
-
 		amountChanges := len(createFiles) + len(removeFiles)
 		if lastAmountChanges > 0 && amountChanges == lastAmountChanges {
 			err = d.applyChanges(createFiles, removeFiles)
@@ -157,6 +151,7 @@ func (d *downstream) cloneFileMap() map[string]*fileInformation {
 
 func (d *downstream) collectChanges(removeFiles map[string]*fileInformation) ([]*fileInformation, error) {
 	createFiles := make([]*fileInformation, 0, 128)
+	destPathFound := false
 
 	// Write find command to stdin pipe
 	cmd := getFindCommand(d.config.DestPath)
@@ -189,7 +184,7 @@ func (d *downstream) collectChanges(removeFiles map[string]*fileInformation) ([]
 			return nil, errors.Trace(err)
 		}
 
-		done, overlap, err = d.parseLines(string(buf), overlap, &createFiles, removeFiles)
+		done, overlap, err = d.parseLines(string(buf), overlap, &createFiles, removeFiles, &destPathFound)
 		if err != nil {
 			if _, ok := err.(parsingError); ok {
 				time.Sleep(time.Second * 4)
@@ -201,10 +196,14 @@ func (d *downstream) collectChanges(removeFiles map[string]*fileInformation) ([]
 		}
 	}
 
+	if destPathFound == false {
+		return nil, errors.New("DestPath not found, find command did not execute correctly")
+	}
+
 	return createFiles, nil
 }
 
-func (d *downstream) parseLines(buffer, overlap string, createFiles *[]*fileInformation, removeFiles map[string]*fileInformation) (bool, string, error) {
+func (d *downstream) parseLines(buffer, overlap string, createFiles *[]*fileInformation, removeFiles map[string]*fileInformation, destPathFound *bool) (bool, string, error) {
 	lines := strings.Split(buffer, "\n")
 
 	for index, element := range lines {
@@ -229,7 +228,10 @@ func (d *downstream) parseLines(buffer, overlap string, createFiles *[]*fileInfo
 				msg: "Parsing Error",
 			}
 		} else if line != "" {
-			err := d.evaluateFile(line, createFiles, removeFiles)
+			destPath, err := d.evaluateFile(line, createFiles, removeFiles)
+			if destPath {
+				*destPathFound = destPath
+			}
 
 			if err != nil {
 				return true, "", errors.Trace(err)
@@ -240,20 +242,20 @@ func (d *downstream) parseLines(buffer, overlap string, createFiles *[]*fileInfo
 	return false, overlap, nil
 }
 
-func (d *downstream) evaluateFile(fileline string, createFiles *[]*fileInformation, removeFiles map[string]*fileInformation) error {
+func (d *downstream) evaluateFile(fileline string, createFiles *[]*fileInformation, removeFiles map[string]*fileInformation) (bool, error) {
 	d.config.fileIndex.fileMapMutex.Lock()
 	defer d.config.fileIndex.fileMapMutex.Unlock()
 
 	fileInformation, err := parseFileInformation(fileline, d.config.DestPath)
 
 	// Error parsing line
 	if err != nil {
-		return errors.Trace(err)
+		return false, errors.Trace(err)
 	}
 
 	// No file found
 	if fileInformation == nil {
-		return nil
+		return true, nil
 	}
 
 	// File found don't delete it
@@ -277,7 +279,7 @@ func (d *downstream) evaluateFile(fileline string, createFiles *[]*fileInformati
 		*createFiles = append(*createFiles, fileInformation)
 	}
 
-	return nil
+	return false, nil
 }
 
 func (d *downstream) applyChanges(createFiles []*fileInformation, removeFiles map[string]*fileInformation) error {

pkg/devspace/sync/file_information.go

@@ -56,48 +56,42 @@ func (p parsingError) Error() string {
 }
 
 func getFindCommand(destPath string) string {
-	return "mkdir -p '" + destPath + "' && find -L '" + destPath + "' -exec stat -c \"%n///%s,%Y,%f,%a,%u,%g\" {} + 2>/dev/null && echo -n \"" + EndAck + "\" || echo \"" + ErrorAck + "\"\n"
+	return "mkdir -p '" + destPath + "' && find -L '" + destPath + "' -exec stat -c \"%n///%s,%Y,%f,%a,%u,%g\" {} + 2>/dev/null && echo -n \"" + EndAck + "\" || echo -n \"" + ErrorAck + "\"\n"
 }
 
 func parseFileInformation(fileline, destPath string) (*fileInformation, error) {
 	fileinfo := fileInformation{}
 
 	t := strings.Split(fileline, "///")
-
 	if len(t) != 2 {
 		return nil, errors.New("[Downstream] Wrong fileline: " + fileline)
 	}
-
 	if len(t[0]) <= len(destPath) {
 		return nil, nil
 	}
 
 	fileinfo.Name = t[0][len(destPath):]
 
 	t = strings.Split(t[1], ",")
-
 	if len(t) != 6 {
 		return nil, errors.New("[Downstream] Wrong fileline: " + fileline)
 	}
 
 	size, err := strconv.Atoi(t[0])
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 
 	fileinfo.Size = int64(size)
 
 	mTime, err := strconv.Atoi(t[1])
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 
 	fileinfo.Mtime = int64(mTime)
 
 	rawMode, err := strconv.ParseUint(t[2], 16, 32) // Parse hex string into uint64
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -107,23 +101,20 @@ func parseFileInformation(fileline, destPath string) (*fileInformation, error) {
 	fileinfo.IsDirectory = (rawMode & IsDirectory) == IsDirectory
 
 	mode, err := strconv.ParseInt(t[3], 8, 32)
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 
 	fileinfo.RemoteMode = mode
 
 	uid, err := strconv.Atoi(t[4])
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 
 	fileinfo.RemoteUID = uid
 
 	gid, err := strconv.Atoi(t[5])
-
 	if err != nil {
 		return nil, errors.Trace(err)
 	}