From 03671cc4a4ce2766fe028b0d3cce8ed05165c29e Mon Sep 17 00:00:00 2001
From: Adnan Maolood <me@adnano.co>
Date: Wed, 9 Nov 2022 06:49:27 -0500
Subject: [PATCH] api/graph: Avoid race condition when cloning repos

---
 api/graph/schema.resolvers.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go
index 1c94c27..c6ec4fb 100644
--- a/api/graph/schema.resolvers.go
+++ b/api/graph/schema.resolvers.go
@@ -107,6 +107,7 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
 	var (
 		repoCreated bool
 		repo        model.Repository
+		gitrepo     *git.Repository
 	)
 	defer func() {
 		if err := recover(); err != nil {
@@ -147,7 +148,8 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
 			return err
 		}
 
-		gitrepo, err := git.PlainInit(repoPath, true)
+		var err error
+		gitrepo, err = git.PlainInit(repoPath, true)
 		if err != nil {
 			return err
 		}
@@ -224,8 +226,6 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
 				}
 				cloneURL = &repo.Path
 			}
-
-			repos.Clone(ctx, repo.ID, gitrepo, *cloneURL)
 		}
 
 		webhooks.DeliverRepoEvent(ctx, model.WebhookEventRepoCreated, &repo)
@@ -241,6 +241,12 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
 		return nil, err
 	}
 
+	// Schedule the clone after the transaction has committed to avoid race
+	// conditions for repository.clone_status.
+	if cloneURL != nil {
+		repos.Clone(ctx, repo.ID, gitrepo, *cloneURL)
+	}
+
 	return &repo, nil
 }