[Ingest Manager] Change Sync/Close call order (elastic#21735)

michalpristas · Oct 14, 2020 · 0d8e731 · 0d8e731
1 parent 09c3096
commit 0d8e731
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/x-pack/elastic-agent/pkg/artifact/install/tar/tar_installer.go b/x-pack/elastic-agent/pkg/artifact/install/tar/tar_installer.go
@@ -99,15 +99,19 @@ func unpack(r io.Reader, dir string) error {
 			}
 
 			_, err = io.Copy(wf, tr)
+
+			if err == nil {
+				// sometimes we try executing binary too fast and run into text file busy after unpacking
+				// syncing prevents this
+				if syncErr := wf.Sync(); syncErr != nil {
+					err = syncErr
+				}
+			}
+
 			if closeErr := wf.Close(); closeErr != nil && err == nil {
 				err = closeErr
 			}
 
-			// sometimes we try executing binary too fast and run into text file busy after unpacking
-			// syncing prevents this
-			if syncErr := wf.Sync(); syncErr != nil && err == nil {
-				err = syncErr
-			}
 			if err != nil {
 				return fmt.Errorf("TarInstaller: error writing to %s: %v", abs, err)
 			}

diff --git a/x-pack/elastic-agent/pkg/artifact/install/zip/zip_installer.go b/x-pack/elastic-agent/pkg/artifact/install/zip/zip_installer.go
@@ -105,18 +105,15 @@ func (i *Installer) unzip(artifactPath string) error {
 				if closeErr := f.Close(); closeErr != nil {
 					err = multierror.Append(err, closeErr)
 				}
-
-				// sometimes we try executing binary too fast and run into text file busy after unpacking
-				// syncing prevents this
-				if syncErr := f.Sync(); syncErr != nil {
-					err = multierror.Append(err, syncErr)
-				}
-
 			}()
 
 			if _, err = io.Copy(f, rc); err != nil {
 				return err
 			}
+
+			// sometimes we try executing binary too fast and run into text file busy after unpacking
+			// syncing prevents this
+			f.Sync()
 		}
 		return nil
 	}