Merge pull request #32559 from guangxuli/k8s_lock

Automatic merge from submit-queue the lockfile should be handled after function return

Merge pull request #32559 from guangxuli/k8s_lock
c1e8c6d8 · Kubernetes Submit Queue · GitHub · e811f5b9 · 05d0c720 · c1e8c6d8
Commit c1e8c6d8 authored Sep 28, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

flock_unix.go pkg/util/flock/flock_unix.go +1 -1

No files found.
--- a/pkg/util/flock/flock_unix.go
+++ b/pkg/util/flock/flock_unix.go
@@ -42,7 +42,7 @@ func Acquire(path string) error {
 	if lockfile, err = os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600); err != nil {
 		return err
 	}
-
+	defer lockfile.Close()
 	opts := unix.Flock_t{Type: unix.F_WRLCK}
 	if err := unix.FcntlFlock(lockfile.Fd(), unix.F_SETLKW, &opts); err != nil {
 		return err