Merge pull request #29266 from xiangpengzhao/fix_defer_close

Automatic merge from submit-queue Add f.Close() for applyOOMScoreAdj

Merge pull request #29266 from xiangpengzhao/fix_defer_close
e2fb251c · k8s-merge-robot · GitHub · 6fd685b5 · 91d11ed7 · e2fb251c
Commit e2fb251c authored Jul 22, 2016 by k8s-merge-robot Committed by GitHub Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

oom_linux.go pkg/util/oom/oom_linux.go +6 -0

No files found.
--- a/pkg/util/oom/oom_linux.go
+++ b/pkg/util/oom/oom_linux.go
@@ -76,6 +76,12 @@ func applyOOMScoreAdj(pid int, oomScoreAdj int) error {
 			continue
 		}
 		if _, err := f.Write([]byte(value)); err != nil {
+			// we can ignore the return value of f.Close() here.
+			f.Close()
+			err = fmt.Errorf("failed to apply oom-score-adj to pid %d (%v)", pid, err)
+			continue
+		}
+		if err = f.Close(); err != nil {
 			err = fmt.Errorf("failed to apply oom-score-adj to pid %d (%v)", pid, err)
 			continue
 		}