From 4f5122a7fed227ddcc98b76be8dac3945582f91a Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 1 Dec 2023 00:39:16 +0800
Subject: [PATCH] Ignore "non-existing" errors when getDirectorySize calculates
the size (#28276) (#28285)
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.
---
modules/repository/create.go | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/modules/repository/create.go b/modules/repository/create.go
index 2dac35224e..7c954a1412 100644
--- a/modules/repository/create.go
+++ b/modules/repository/create.go
@@ -160,24 +160,25 @@ const notRegularFileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | o
// getDirectorySize returns the disk consumption for a given path
func getDirectorySize(path string) (int64, error) {
var size int64
- err := filepath.WalkDir(path, func(_ string, info os.DirEntry, err error) error {
- if err != nil {
- if os.IsNotExist(err) { // ignore the error because the file maybe deleted during traversing.
- return nil
- }
+ err := filepath.WalkDir(path, func(_ string, entry os.DirEntry, err error) error {
+ if os.IsNotExist(err) { // ignore the error because some files (like temp/lock file) may be deleted during traversing.
+ return nil
+ } else if err != nil {
return err
}
- if info.IsDir() {
+ if entry.IsDir() {
return nil
}
- f, err := info.Info()
- if err != nil {
+ info, err := entry.Info()
+ if os.IsNotExist(err) { // ignore the error as above
+ return nil
+ } else if err != nil {
return err
}
- if (f.Mode() & notRegularFileMode) == 0 {
- size += f.Size()
+ if (info.Mode() & notRegularFileMode) == 0 {
+ size += info.Size()
}
- return err
+ return nil
})
return size, err
}