Merge pull request kubernetes#101796 from wzshiming/automated-cherry-…

…pick-of-#100326-upstream-release-1.20 Automated cherry pick of kubernetes#100326: Fix watchForLockfileContention memory leak
openshift · Jun 8, 2021 · 9e001aa · 9e001aa
2 parents 9aae7d8 + 5149a75
commit 9e001aa
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmd/kubelet/app/server_linux.go b/cmd/kubelet/app/server_linux.go
@@ -29,6 +29,7 @@ func watchForLockfileContention(path string, done chan struct{}) error {
 	}
 	if err = watcher.AddWatch(path, inotify.InOpen|inotify.InDeleteSelf); err != nil {
 		klog.Errorf("unable to watch lockfile: %v", err)
+		watcher.Close()
 		return err
 	}
 	go func() {
@@ -39,6 +40,7 @@ func watchForLockfileContention(path string, done chan struct{}) error {
 			klog.Errorf("inotify watcher error: %v", err)
 		}
 		close(done)
+		watcher.Close()
 	}()
 	return nil
 }