0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon/graphdriver/devmapper: use filepath.WalkDir instead of filepath.Walk

Browse source 
WalkDir is more performant as it doesn't perform an os.Lstat on every visited
file or directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-10-09 17:04:44 +02:00
parent 8f1bc0bccc
commit f595434abc
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
daemon/graphdriver/devmapper/deviceset.go
View file

@ -407,33 +407,33 @@ func (devices *DeviceSet) constructDeviceIDMap() {
}
}
func (devices *DeviceSet) deviceFileWalkFunction(path string, finfo os.FileInfo) error {
func (devices *DeviceSet) deviceFileWalkFunction(path string, name string) error {
logger := logrus.WithField("storage-driver", "devicemapper")
// Skip some of the meta files which are not device files.
if strings.HasSuffix(finfo.Name(), ".migrated") {
if strings.HasSuffix(name, ".migrated") {
logger.Debugf("Skipping file %s", path)
return nil
}
if strings.HasPrefix(finfo.Name(), ".") {
if strings.HasPrefix(name, ".") {
logger.Debugf("Skipping file %s", path)
return nil
}
if finfo.Name() == deviceSetMetaFile {
if name == deviceSetMetaFile {
logger.Debugf("Skipping file %s", path)
return nil
}
if finfo.Name() == transactionMetaFile {
if name == transactionMetaFile {
logger.Debugf("Skipping file %s", path)
return nil
}
logger.Debugf("Loading data for file %s", path)
hash := finfo.Name()
hash := name
if hash == "base" {
hash = ""
}
@ -451,7 +451,7 @@ func (devices *DeviceSet) loadDeviceFilesOnStart() error {
logrus.WithField("storage-driver", "devicemapper").Debug("loadDeviceFilesOnStart()")
defer logrus.WithField("storage-driver", "devicemapper").Debug("loadDeviceFilesOnStart() END")
var scan = func(path string, info os.FileInfo, err error) error {
var scan = func(path string, info os.DirEntry, err error) error {
if err != nil {
logrus.WithField("storage-driver", "devicemapper").Debugf("Can't walk the file %s", path)
return nil
@ -462,10 +462,10 @@ func (devices *DeviceSet) loadDeviceFilesOnStart() error {
return nil
}
return devices.deviceFileWalkFunction(path, info)
return devices.deviceFileWalkFunction(path, info.Name())
}
return filepath.Walk(devices.metadataDir(), scan)
return filepath.WalkDir(devices.metadataDir(), scan)
}
// Should be called with devices.Lock() held.