Merge pull request #1364 from mskanth972/efs-proxy-PIDs_issue

k8s-ci-robot · web-flow · commit 227730ee74a4 · 2024-06-06T06:46:52.000-07:00
Fix efs-proxy Zombie processes
diff --git a/pkg/driver/reaper.go b/pkg/driver/reaper.go
@@ -85,7 +85,7 @@ func (r *reaper) stop() {
 }
 
 func waitIfZombieStunnel(p ps.Process) bool {
-	if !strings.Contains(p.Executable(), "stunnel") {
+	if !strings.Contains(p.Executable(), "stunnel") && !strings.Contains(p.Executable(), "efs-proxy") {
 		return false
 	}
 	data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%v/status", p.Pid()))

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func (r *reaper) stop() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`func waitIfZombieStunnel(p ps.Process) bool {`
`88`		`- if !strings.Contains(p.Executable(), "stunnel") {`
	`88`	`+ if !strings.Contains(p.Executable(), "stunnel") && !strings.Contains(p.Executable(), "efs-proxy") {`
`89`	`89`	`return false`
`90`	`90`	`}`
`91`	`91`	`data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%v/status", p.Pid()))`