cerc-io/gitea
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix race on indexer (#9136)

Browse Source
This commit is contained in:
Lunny Xiao 2019-11-23 23:03:35 +08:00 committed by GitHub
parent 7b4d2f7a2a
commit 9856ac5818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
models/repo_indexer.go
View File

@ -60,7 +60,7 @@ func (repo *Repository) updateIndexerStatus(sha string) error {
} }
type repoIndexerOperation struct { type repoIndexerOperation struct {
repo *Repository repoID int64
deleted bool deleted bool
watchers []chan<- error watchers []chan<- error
} }
@ -145,7 +145,7 @@ func populateRepoIndexer(maxRepoID int64) {
} }
for _, repo := range repos { for _, repo := range repos {
repoIndexerOperationQueue <- repoIndexerOperation{ repoIndexerOperationQueue <- repoIndexerOperation{
repo: repo, repoID: repo.ID,
deleted: false, deleted: false,
} }
maxRepoID = repo.ID - 1 maxRepoID = repo.ID - 1
@ -154,7 +154,12 @@ func populateRepoIndexer(maxRepoID int64) {
log.Info("Done populating the repo indexer with existing repositories") log.Info("Done populating the repo indexer with existing repositories")
} }
func updateRepoIndexer(repo *Repository) error { func updateRepoIndexer(repoID int64) error {
repo, err := getRepositoryByID(x, repoID)
if err != nil {
return err
}
sha, err := getDefaultBranchSha(repo) sha, err := getDefaultBranchSha(repo)
if err != nil { if err != nil {
return err return err
@ -362,11 +367,11 @@ func processRepoIndexerOperationQueue() {
op := <-repoIndexerOperationQueue op := <-repoIndexerOperationQueue
var err error var err error
if op.deleted { if op.deleted {
if err = indexer.DeleteRepoFromIndexer(op.repo.ID); err != nil { if err = indexer.DeleteRepoFromIndexer(op.repoID); err != nil {
log.Error("DeleteRepoFromIndexer: %v", err) log.Error("DeleteRepoFromIndexer: %v", err)
} }
} else { } else {
if err = updateRepoIndexer(op.repo); err != nil { if err = updateRepoIndexer(op.repoID); err != nil {
log.Error("updateRepoIndexer: %v", err) log.Error("updateRepoIndexer: %v", err)
} }
} }
@ -378,12 +383,12 @@ func processRepoIndexerOperationQueue() {
// DeleteRepoFromIndexer remove all of a repository's entries from the indexer // DeleteRepoFromIndexer remove all of a repository's entries from the indexer
func DeleteRepoFromIndexer(repo *Repository, watchers ...chan<- error) { func DeleteRepoFromIndexer(repo *Repository, watchers ...chan<- error) {
addOperationToQueue(repoIndexerOperation{repo: repo, deleted: true, watchers: watchers}) addOperationToQueue(repoIndexerOperation{repoID: repo.ID, deleted: true, watchers: watchers})
} }
// UpdateRepoIndexer update a repository's entries in the indexer // UpdateRepoIndexer update a repository's entries in the indexer
func UpdateRepoIndexer(repo *Repository, watchers ...chan<- error) { func UpdateRepoIndexer(repo *Repository, watchers ...chan<- error) {
addOperationToQueue(repoIndexerOperation{repo: repo, deleted: false, watchers: watchers}) addOperationToQueue(repoIndexerOperation{repoID: repo.ID, deleted: false, watchers: watchers})
} }
func addOperationToQueue(op repoIndexerOperation) { func addOperationToQueue(op repoIndexerOperation) {