github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127100 from jsturtevant/automated-cherry-pick-of-#126976-upstream-release-1.31

Browse Source 
Automated cherry pick of #126976: Revert "fix: handle socket file detection on Windows"
This commit is contained in:
Kubernetes Prow Robot
2024-09-04 09:28:16 +01:00
committed by GitHub
parent 6e744c6b04 2454d8d4c3
commit f67b92227c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/cm/devicemanager/manager.go
View File

@@ -203,12 +203,15 @@ func (m *ManagerImpl) CleanupPluginDirectory(dir string) error {
if filePath == m.checkpointFile() { if filePath == m.checkpointFile() {
continue continue
} }
stat, err := os.Stat(filePath) // TODO: Until the bug - https://github.com/golang/go/issues/33357 is fixed, os.stat wouldn't return the
// right mode(socket) on windows. Hence deleting the file, without checking whether
// its a socket, on windows.
stat, err := os.Lstat(filePath)
if err != nil { if err != nil {
klog.ErrorS(err, "Failed to stat file", "path", filePath) klog.ErrorS(err, "Failed to stat file", "path", filePath)
continue continue
} }
if stat.IsDir() || stat.Mode()&os.ModeSocket == 0 { if stat.IsDir() {
continue continue
} }
err = os.RemoveAll(filePath) err = os.RemoveAll(filePath)