Merge pull request #52125 from yujuhong/fix-file-sync

Automatic merge from submit-queue (batch tested with PRs 52339, 52343, 52125, 52360, 52301) dockershim: check if f.Sync() returns an error and surface it ```release-note dockershim: check the error when syncing the checkpoint. ```

Merge pull request #52125 from yujuhong/fix-file-sync
c6a9b1e1 · Kubernetes Submit Queue · GitHub · e81aeb59 · a8506146 · c6a9b1e1
Commit c6a9b1e1 authored Sep 12, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 12, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

checkpoint_store.go pkg/kubelet/dockershim/checkpoint_store.go +4 -1

No files found.
--- a/pkg/kubelet/dockershim/checkpoint_store.go
+++ b/pkg/kubelet/dockershim/checkpoint_store.go
@@ -76,7 +76,10 @@ func writeFileAndSync(filename string, data []byte, perm os.FileMode) error {
 	if err == nil && n < len(data) {
 		err = io.ErrShortWrite
 	}
-	f.Sync()
+	if err == nil {
+		// Only sync if the Write completed successfully.
+		err = f.Sync()
+	}
 	if err1 := f.Close(); err == nil {
 		err = err1
 	}