some improvements

Author: lunny

services/repository/adopt.go

@@ -27,8 +27,8 @@ import (
 	"github.com/gobwas/glob"
 )
 
-func deleteFailedAdoptRepository(ctx context.Context, repoID int64) error {
-	return db.WithTx(ctx, func(ctx context.Context) error {
+func deleteFailedAdoptRepository(repoID int64) error {
+	return db.WithTx(db.DefaultContext, func(ctx context.Context) error {
 		if err := deleteDBRepository(ctx, repoID); err != nil {
 			return fmt.Errorf("deleteDBRepository: %w", err)
 		}
@@ -75,7 +75,8 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
 	// WARNING: Don't override all later err with local variables
 	defer func() {
 		if err != nil {
-			if errDel := deleteFailedAdoptRepository(ctx, repo.ID); errDel != nil {
+			// we can not use the ctx because it maybe canceled or timeout
+			if errDel := deleteFailedAdoptRepository(repo.ID); errDel != nil {
 				log.Error("Failed to delete repository %s that could not be adopted: %v", repo.FullName(), errDel)
 			}
 		}

services/repository/adopt_test.go

@@ -102,7 +102,7 @@ func TestAdoptRepository(t *testing.T) {
 	assert.Equal(t, "sha1", repoTestAdopt.ObjectFormatName)
 
 	// just delete the adopted repo's db records
-	err = deleteFailedAdoptRepository(db.DefaultContext, adoptedRepo.ID)
+	err = deleteFailedAdoptRepository(adoptedRepo.ID)
 	assert.NoError(t, err)
 
 	unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: "user2", Name: "test-adopt"})

services/repository/create.go

@@ -259,6 +259,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, u *user_model.User, opt
 	// WARNING: Don't override all later err with local variables
 	defer func() {
 		if err != nil {
+			// we can not use the ctx because it maybe canceled or timeout
 			cleanupRepository(doer, repo.ID)
 		}
 	}()

services/repository/fork.go

@@ -123,6 +123,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 	// WARNING: Don't override all later err with local variables
 	defer func() {
 		if err != nil {
+			// we can not use the ctx because it maybe canceled or timeout
 			cleanupRepository(doer, repo.ID)
 		}
 	}()

services/repository/template.go

@@ -114,6 +114,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
 	// last - clean up the repository if something goes wrong
 	defer func() {
 		if err != nil {
+			// we can not use the ctx because it maybe canceled or timeout
 			cleanupRepository(doer, generateRepo.ID)
 		}
 	}()