github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123819 from fakecore/fc/master

Browse Source 
fix: handle socket file detection on Windows
This commit is contained in:
Kubernetes Prow Robot 2024-07-18 00:53:16 -07:00 committed by GitHub
commit 9196650533
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,15 +192,12 @@ func (m *ManagerImpl) CleanupPluginDirectory(dir string) error {
if filePath == m.checkpointFile() { if filePath == m.checkpointFile() {
continue continue
} }
// TODO: Until the bug - https://github.com/golang/go/issues/33357 is fixed, os.stat wouldn't return the stat, err := os.Stat(filePath)
// 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() { if stat.IsDir() || stat.Mode()&os.ModeSocket == 0 {
continue continue
} }
err = os.RemoveAll(filePath) err = os.RemoveAll(filePath)