Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion pkg/azurefile/nodeserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package azurefile
import (
"encoding/json"
"fmt"
"io"
"os"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -800,7 +801,16 @@ func (d *Driver) ensureMountPoint(target string, perm os.FileMode) (bool, error)

if !notMnt {
// testing original mount point, make sure the mount link is valid
_, err := os.ReadDir(target)
// Use ReadDir(1) instead of full os.ReadDir to avoid expensive directory listing
f, err := os.Open(target)
if err == nil {
defer f.Close()
_, err = f.ReadDir(1)
// EOF means empty directory, which is valid
if err == io.EOF {
err = nil
}
}
if err == nil {
klog.V(2).Infof("already mounted to target %s", target)
return !notMnt, nil
Expand Down
Loading