repository: Exclude merge-requests, keep-around, pipelines from sizejc-exclude-keep-around-refs-from-repo-size

The RepositorySize RPC is used to determine the disk-usage of the
repository that is under the control of the user. There are certain refs
like refs/keep-around/*, refs/merge-requests/*, refs/pipelines/* that
GitLab uses internally, so these should not contribute to the overall
size of the repository.

Changelog: changed

2 files changed, 46 insertions, 3 deletions

diff --git a/internal/gitaly/service/repository/size.go b/internal/gitaly/service/repository/size.go
index 4d43dc2b1..a6bb0d33e 100644
--- a/internal/gitaly/service/repository/size.go
+++ b/internal/gitaly/service/repository/size.go
@@ -10,6 +10,8 @@ import (
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/command"
+	"gitlab.com/gitlab-org/gitaly/v14/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v14/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
 )
@@ -19,8 +21,16 @@ func (s *server) RepositorySize(ctx context.Context, in *gitalypb.RepositorySize
 	var size int64
 	var err error
 
+	var excludes []string
+	for _, prefix := range git.InternalRefPrefixes {
+		excludes = append(excludes, prefix+"*")
+	}
+
 	if featureflag.RevlistForRepoSize.IsEnabled(ctx) {
-		size, err = repo.Size(ctx)
+		size, err = repo.Size(
+			ctx,
+			localrepo.WithExcludes(excludes...),
+		)
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go
index b9c752723..52252f349 100644
--- a/internal/gitaly/service/repository/size_test.go
+++ b/internal/gitaly/service/repository/size_test.go
@@ -1,10 +1,13 @@
 package repository
 
 import (
+	"bytes"
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/v14/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/quarantine"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/config"
@@ -26,7 +29,7 @@ func TestRepositorySize_SuccessfulRequest(t *testing.T) {
 }
 
 func testSuccessfulRepositorySizeRequest(t *testing.T, ctx context.Context) {
-	_, repo, _, client := setupRepositoryService(ctx, t)
+	cfg, repo, repoPath, client := setupRepositoryService(ctx, t)
 
 	request := &gitalypb.RepositorySizeRequest{Repository: repo}
 	response, err := client.RepositorySize(ctx, request)
@@ -36,9 +39,39 @@ func testSuccessfulRepositorySizeRequest(t *testing.T, ctx context.Context) {
 		response.Size > testRepoMinSizeKB,
 		"repository size %d should be at least %d", response.Size, testRepoMinSizeKB,
 	)
+
+	blob := bytes.Repeat([]byte("a"), 1000)
+	blobOID := gittest.WriteBlob(t, cfg, repoPath, blob)
+	treeOID := gittest.WriteTree(t, cfg, repoPath, []gittest.TreeEntry{
+		{
+			OID:  blobOID,
+			Mode: "100644",
+			Path: "1kbblob",
+		},
+	})
+	commitOID := gittest.WriteCommit(t, cfg, repoPath, gittest.WithTree(treeOID))
+
+	gittest.WriteRef(t, cfg, repoPath, git.ReferenceName("refs/keep-around/keep1"), commitOID)
+	gittest.WriteRef(t, cfg, repoPath, git.ReferenceName("refs/merge-requests/1123"), commitOID)
+	gittest.WriteRef(t, cfg, repoPath, git.ReferenceName("refs/pipelines/pipeline2"), commitOID)
+	gittest.WriteRef(t, cfg, repoPath, git.ReferenceName("refs/environments/env1"), commitOID)
+
+	responseAfterRefs, err := client.RepositorySize(ctx, request)
+	require.NoError(t, err)
+
+	if featureflag.RevlistForRepoSize.IsEnabled(ctx) {
+		assert.Equal(
+			t,
+			response.Size,
+			responseAfterRefs.Size,
+			"excluded refs do not contribute to the repository size",
+		)
+	} else {
+		assert.Less(t, response.Size, responseAfterRefs.Size)
+	}
 }
 
-func TestRepositorySixe_FailedRequest(t *testing.T) {
+func TestRepositorySize_FailedRequest(t *testing.T) {
 	t.Parallel()
 	testhelper.NewFeatureSets(featureflag.RevlistForRepoSize).
 		Run(t, testFailedRepositorySizeRequest)