api/graph: Avoid race condition when cloning repos
This commit is contained in:
parent
fe9d0d9ab3
commit
03671cc4a4
|
@ -107,6 +107,7 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
|
||||||
var (
|
var (
|
||||||
repoCreated bool
|
repoCreated bool
|
||||||
repo model.Repository
|
repo model.Repository
|
||||||
|
gitrepo *git.Repository
|
||||||
)
|
)
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := recover(); err != nil {
|
if err := recover(); err != nil {
|
||||||
|
@ -147,7 +148,8 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
gitrepo, err := git.PlainInit(repoPath, true)
|
var err error
|
||||||
|
gitrepo, err = git.PlainInit(repoPath, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -224,8 +226,6 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
|
||||||
}
|
}
|
||||||
cloneURL = &repo.Path
|
cloneURL = &repo.Path
|
||||||
}
|
}
|
||||||
|
|
||||||
repos.Clone(ctx, repo.ID, gitrepo, *cloneURL)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
webhooks.DeliverRepoEvent(ctx, model.WebhookEventRepoCreated, &repo)
|
webhooks.DeliverRepoEvent(ctx, model.WebhookEventRepoCreated, &repo)
|
||||||
|
@ -241,6 +241,12 @@ func (r *mutationResolver) CreateRepository(ctx context.Context, name string, vi
|
||||||
return nil, err
|
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
|
return &repo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue