mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 05:45:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ignore "non-existing" errors when getDirectorySize calculates the size (#28276) (#28285)

Browse source 
Backport #28276

The git command may operate the git directory (add/remove) files in any
time.

So when the code iterates the directory, some files may disappear during
the "walk". All "IsNotExist" errors should be ignored.

(cherry picked from commit 4f5122a7fe)
This commit is contained in:
wxiaoguang 2023-12-01 00:39:16 +08:00 committed by Earl Warren
parent 8aee1ae8e9
commit 6cc02cdfd4
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/repository/create.go
View file

@ -160,24 +160,25 @@ const notRegularFileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | o
// getDirectorySize returns the disk consumption for a given path // getDirectorySize returns the disk consumption for a given path
func getDirectorySize(path string) (int64, error) { func getDirectorySize(path string) (int64, error) {
var size int64 var size int64
err := filepath.WalkDir(path, func(_ string, info os.DirEntry, err error) error { err := filepath.WalkDir(path, func(_ string, entry os.DirEntry, err error) error {
if err != nil { if os.IsNotExist(err) { // ignore the error because some files (like temp/lock file) may be deleted during traversing.
if os.IsNotExist(err) { // ignore the error because the file maybe deleted during traversing. return nil
return nil } else if err != nil {
}
return err return err
} }
if info.IsDir() { if entry.IsDir() {
return nil return nil
} }
f, err := info.Info() info, err := entry.Info()
if err != nil { if os.IsNotExist(err) { // ignore the error as above
return nil
} else if err != nil {
return err return err
} }
if (f.Mode() & notRegularFileMode) == 0 { if (info.Mode() & notRegularFileMode) == 0 {
size += f.Size() size += info.Size()
} }
return err return nil
}) })
return size, err return size, err
} }