Skip to content

Commit

Permalink
Use directory iterator instead of walkdir (#2260)
Browse files Browse the repository at this point in the history
* Use directory iterator instead of walkdir

* pr comments
  • Loading branch information
dustin-decker authored Dec 23, 2023
1 parent 78d8dd3 commit 1cc41e2
Showing 1 changed file with 20 additions and 12 deletions.
32 changes: 20 additions & 12 deletions pkg/cleantemp/cleantemp.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cleantemp

import (
"fmt"
"io/fs"
"io"
"os"
"path/filepath"
"regexp"
Expand Down Expand Up @@ -69,25 +69,38 @@ func CleanTempArtifacts(ctx logContext.Context) error {
}

tempDir := os.TempDir()
err = filepath.WalkDir(tempDir, func(path string, d fs.DirEntry, err error) error {
dir, err := os.Open(tempDir)
if err != nil {
return fmt.Errorf("error opening temp dir: %w", err)
}
defer dir.Close()

for {
entries, err := dir.ReadDir(1) // read only one entry
if err != nil {
return fmt.Errorf("error walking temp dir: %w", err)
if err == io.EOF {
break
}
continue
}
if trufflehogRE.MatchString(d.Name()) {
entry := entries[0]

if trufflehogRE.MatchString(entry.Name()) {

// Mark these artifacts initially as ones that should be deleted.
shouldDelete := true
// Check if the name matches any live PIDs.
// Potential race condition here if a PID is started and creates tmp data after the initial check.
for _, pidval := range pids {
if strings.Contains(d.Name(), fmt.Sprintf("-%s-", pidval)) {
if strings.Contains(entry.Name(), fmt.Sprintf("-%s-", pidval)) {
shouldDelete = false
break
}
}

if shouldDelete {
var err error
if d.IsDir() {
path := filepath.Join(tempDir, entry.Name())
if entry.IsDir() {
err = os.RemoveAll(path)
} else {
err = os.Remove(path)
Expand All @@ -99,11 +112,6 @@ func CleanTempArtifacts(ctx logContext.Context) error {
ctx.Logger().V(4).Info("Deleted orphaned temp artifact", "artifact", path)
}
}
return nil
})

if err != nil {
return fmt.Errorf("error walking temp dir: %w", err)
}

return nil
Expand Down

0 comments on commit 1cc41e2

Please sign in to comment.