Merge branch 'ps-houskeeping-fixes' into 'master'

housekeeping: Replace status.Errorf with helper.ErrXXXf

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4979

Merged-by: Pavlo Strokov <pstrokov@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Christian Couder <chriscool@tuxfamily.org>

5 files changed, 16 insertions, 5 deletions

diff --git a/internal/git/housekeeping/clean_stale_data_test.go b/internal/git/housekeeping/clean_stale_data_test.go
index b030bf385..300ceed55 100644
--- a/internal/git/housekeeping/clean_stale_data_test.go
+++ b/internal/git/housekeeping/clean_stale_data_test.go
@@ -177,6 +177,7 @@ func requireCleanStaleDataMetrics(t *testing.T, m *RepositoryManager, metrics cl
 }
 
 func TestRepositoryManager_CleanStaleData(t *testing.T) {
+	t.Parallel()
 	testcases := []struct {
 		name            string
 		entries         []entry
@@ -301,6 +302,7 @@ func TestRepositoryManager_CleanStaleData(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_references(t *testing.T) {
+	t.Parallel()
 	type ref struct {
 		name string
 		age  time.Duration
@@ -405,6 +407,7 @@ func TestRepositoryManager_CleanStaleData_references(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_emptyRefDirs(t *testing.T) {
+	t.Parallel()
 	testcases := []struct {
 		name            string
 		entries         []entry
@@ -681,6 +684,7 @@ func TestRepositoryManager_CleanStaleData_withSpecificFile(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_serverInfo(t *testing.T) {
+	t.Parallel()
 	ctx := testhelper.Context(t)
 
 	cfg, repoProto, repoPath := testcfg.BuildWithRepo(t)
@@ -730,6 +734,7 @@ func TestRepositoryManager_CleanStaleData_serverInfo(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_referenceLocks(t *testing.T) {
+	t.Parallel()
 	ctx := testhelper.Context(t)
 
 	for _, tc := range []struct {
@@ -791,6 +796,7 @@ func TestRepositoryManager_CleanStaleData_referenceLocks(t *testing.T) {
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
+			t.Parallel()
 			cfg, repoProto, repoPath := testcfg.BuildWithRepo(t)
 			repo := localrepo.NewTestRepo(t, cfg, repoProto)
 
@@ -852,6 +858,7 @@ func (m mockFileInfo) ModTime() time.Time {
 }
 
 func TestIsStaleTemporaryObject(t *testing.T) {
+	t.Parallel()
 	for _, tc := range []struct {
 		name          string
 		dirEntry      fs.DirEntry
@@ -908,6 +915,7 @@ func TestIsStaleTemporaryObject(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_missingRepo(t *testing.T) {
+	t.Parallel()
 	cfg, repoProto, repoPath := testcfg.BuildWithRepo(t)
 	repo := localrepo.NewTestRepo(t, cfg, repoProto)
 	ctx := testhelper.Context(t)
@@ -918,6 +926,7 @@ func TestRepositoryManager_CleanStaleData_missingRepo(t *testing.T) {
 }
 
 func TestRepositoryManager_CleanStaleData_unsetConfiguration(t *testing.T) {
+	t.Parallel()
 	ctx := testhelper.Context(t)
 	cfg := testcfg.Build(t)
 
diff --git a/internal/git/housekeeping/commit_graph.go b/internal/git/housekeeping/commit_graph.go
index 351c10822..1a41a0378 100644
--- a/internal/git/housekeeping/commit_graph.go
+++ b/internal/git/housekeeping/commit_graph.go
@@ -75,7 +75,7 @@ func WriteCommitGraph(ctx context.Context, repo *localrepo.Repo, cfg WriteCommit
 		Action: "write",
 		Flags:  flags,
 	}, git.WithStderr(&stderr)); err != nil {
-		return helper.ErrInternalf("writing commit-graph: %s: %v", err, stderr.String())
+		return helper.ErrInternalf("writing commit-graph: %w: %v", err, stderr.String())
 	}
 
 	return nil
diff --git a/internal/git/housekeeping/object_pool_test.go b/internal/git/housekeeping/object_pool_test.go
index daf134505..eabbabc62 100644
--- a/internal/git/housekeeping/object_pool_test.go
+++ b/internal/git/housekeeping/object_pool_test.go
@@ -10,6 +10,7 @@ import (
 )
 
 func TestIsPoolRepository(t *testing.T) {
+	t.Parallel()
 	for _, tc := range []struct {
 		desc       string
 		repo       *gitalypb.Repository
diff --git a/internal/git/housekeeping/optimize_repository_test.go b/internal/git/housekeeping/optimize_repository_test.go
index a43d544c0..3500b8986 100644
--- a/internal/git/housekeeping/optimize_repository_test.go
+++ b/internal/git/housekeeping/optimize_repository_test.go
@@ -152,6 +152,7 @@ func TestPackRefsIfNeeded(t *testing.T) {
 }
 
 func TestOptimizeRepository(t *testing.T) {
+	t.Parallel()
 	ctx := testhelper.Context(t)
 	cfg := testcfg.Build(t)
 
@@ -383,6 +384,7 @@ gitaly_housekeeping_tasks_total{housekeeping_task="total", status="success"} 1
 }
 
 func TestOptimizeRepository_ConcurrencyLimit(t *testing.T) {
+	t.Parallel()
 	ctx := testhelper.Context(t)
 	cfg := testcfg.Build(t)
 
diff --git a/internal/git/housekeeping/worktrees.go b/internal/git/housekeeping/worktrees.go
index 188ef160b..f3e413fe0 100644
--- a/internal/git/housekeeping/worktrees.go
+++ b/internal/git/housekeeping/worktrees.go
@@ -14,8 +14,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/command"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
 )
 
 const (
@@ -30,11 +29,11 @@ func CleanupWorktrees(ctx context.Context, repo *localrepo.Repo) error {
 
 	worktreeThreshold := time.Now().Add(-6 * time.Hour)
 	if err := cleanStaleWorktrees(ctx, repo, worktreeThreshold); err != nil {
-		return status.Errorf(codes.Internal, "Cleanup: cleanStaleWorktrees: %v", err)
+		return helper.ErrInternalf("cleanStaleWorktrees: %w", err)
 	}
 
 	if err := cleanDisconnectedWorktrees(ctx, repo); err != nil {
-		return status.Errorf(codes.Internal, "Cleanup: cleanDisconnectedWorktrees: %v", err)
+		return helper.ErrInternalf("cleanDisconnectedWorktrees: %w", err)
 	}
 
 	return nil