From 89cdd61e844ddb7cb5a27cc78026489d092ac128 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 14 Jan 2023 02:54:02 +0800 Subject: [PATCH 1/2] Fix error when calculate the repository size (#22392) Backport #22392 Fix #22386 `GetDirectorySize` moved as `getDirectorySize` because it becomes a special function which should not be put in `util`. Co-authored-by: Jason Song --- models/fixtures/repository.yml | 2 +- models/repo/update.go | 2 +- modules/repository/create.go | 32 +++++++++++++++++++++++++++++-- modules/repository/create_test.go | 10 ++++++++++ modules/util/path.go | 14 -------------- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index f09953be7e5ad..386904683a12e 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -24,7 +24,7 @@ fork_id: 0 is_template: false template_id: 0 - size: 0 + size: 6708 is_fsck_enabled: true close_issues_via_commit_in_any_branch: false diff --git a/models/repo/update.go b/models/repo/update.go index cc21deb0bc4f1..3d538a4454320 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -185,7 +185,7 @@ func ChangeRepositoryName(doer *user_model.User, repo *Repository, newRepoName s return committer.Commit() } -// UpdateRepoSize updates the repository size, calculating it using util.GetDirectorySize +// UpdateRepoSize updates the repository size, calculating it using getDirectorySize func UpdateRepoSize(ctx context.Context, repoID, size int64) error { _, err := db.GetEngine(ctx).ID(repoID).Cols("size").NoAutoTime().Update(&Repository{ Size: size, diff --git a/modules/repository/create.go b/modules/repository/create.go index 1fec0335a28b4..d4269ff8b882c 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -9,6 +9,7 @@ import ( "fmt" "os" "path" + "path/filepath" "strings" "code.gitea.io/gitea/models" @@ -286,9 +287,36 @@ func CreateRepository(doer, u *user_model.User, opts CreateRepoOptions) (*repo_m return repo, nil } -// UpdateRepoSize updates the repository size, calculating it using util.GetDirectorySize +const notRegularFileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice | os.ModeCharDevice | os.ModeIrregular + +// 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 + } + return err + } + if info.IsDir() { + return nil + } + f, err := info.Info() + if err != nil { + return err + } + if (f.Mode() & notRegularFileMode) == 0 { + size += f.Size() + } + return err + }) + return size, err +} + +// UpdateRepoSize updates the repository size, calculating it using getDirectorySize func UpdateRepoSize(ctx context.Context, repo *repo_model.Repository) error { - size, err := util.GetDirectorySize(repo.RepoPath()) + size, err := getDirectorySize(repo.RepoPath()) if err != nil { return fmt.Errorf("updateSize: %w", err) } diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index 3040782845814..2419576d8e5b5 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -169,3 +169,13 @@ func TestUpdateRepositoryVisibilityChanged(t *testing.T) { assert.NoError(t, err) assert.True(t, act.IsPrivate) } + +func TestGetDirectorySize(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1) + assert.NoError(t, err) + + size, err := getDirectorySize(repo.RepoPath()) + assert.NoError(t, err) + assert.EqualValues(t, size, repo.Size) +} diff --git a/modules/util/path.go b/modules/util/path.go index 3d4ddec21cb29..ac2b82acfe0d1 100644 --- a/modules/util/path.go +++ b/modules/util/path.go @@ -23,20 +23,6 @@ func EnsureAbsolutePath(path, absoluteBase string) string { return filepath.Join(absoluteBase, path) } -const notRegularFileMode os.FileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice | os.ModeCharDevice | os.ModeIrregular - -// GetDirectorySize returns the disk consumption for a given path -func GetDirectorySize(path string) (int64, error) { - var size int64 - err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error { - if info != nil && (info.Mode()¬RegularFileMode) == 0 { - size += info.Size() - } - return err - }) - return size, err -} - // IsDir returns true if given path is a directory, // or returns false when it's a file or does not exist. func IsDir(dir string) (bool, error) { From 9a9f67ae45fe8f370d005b7d93580eb26df5e9db Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Mon, 16 Jan 2023 13:46:14 -0600 Subject: [PATCH 2/2] review: appease linter --- modules/repository/create_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index 2419576d8e5b5..ff70468db14ab 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -172,7 +172,7 @@ func TestUpdateRepositoryVisibilityChanged(t *testing.T) { func TestGetDirectorySize(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1) + repo, err := repo_model.GetRepositoryByID(1) assert.NoError(t, err) size, err := getDirectorySize(repo.RepoPath())