Skip to content

K
k3s
Commit 342aac2f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30402 from dims/fix-issue-30377

Automatic merge from submit-queue Fix intermittent failures in TestPidOf {procfs} Bailout if WalkFunc is called with an error. Fixes #30377 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30402) <!-- Reviewable:end -->
parents b159e29d e1ad642d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/util/procfs/procfs.go
View file @ 342aac2f
...@@ -65,6 +65,9 @@ func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) { ...@@ -65,6 +65,9 @@ func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) {
func PidOf(name string) []int { func PidOf(name string) []int {
pids := []int{} pids := []int{}
filepath.Walk("/proc", func(path string, info os.FileInfo, err error) error { filepath.Walk("/proc", func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
base := filepath.Base(path) base := filepath.Base(path)
// Traverse only the directories we are interested in // Traverse only the directories we are interested in
if info.IsDir() && path != "/proc" { if info.IsDir() && path != "/proc" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment