Merge pull request #39 from resin-os/fadvise-fix

pkg/archive: sync files before issuing the fadvise syscall
balena-os · Oct 13, 2017 · c6df57f · c6df57f
2 parents eeead5b + bcabde6
commit c6df57f
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -513,6 +513,17 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
 			file.Close()
 			return err
 		}
+
+		if err := file.Sync(); err != nil {
+			file.Close()
+			return err
+		}
+
+		if err := unix.Fadvise(int(file.Fd()), 0, 0, unix.FADV_DONTNEED); err != nil {
+			file.Close()
+			return err
+		}
+
 		file.Close()
 
 	case tar.TypeBlock, tar.TypeChar:
@@ -624,19 +635,6 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
 		}
 	}
 
-	if hdr.Typeflag == tar.TypeReg || hdr.Typeflag == tar.TypeRegA {
-		file, err := os.Open(path)
-		if err != nil {
-			file.Close()
-			return err
-		}
-		if err := unix.Fadvise(int(file.Fd()), 0, 0, unix.FADV_DONTNEED); err != nil {
-			file.Close()
-			return err
-		}
-		file.Close()
-	}
-
 	return nil
 }