Skip to content

fix data race on migrate repository (#5224) #5230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2018
Merged

fix data race on migrate repository (#5224) #5230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions models/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,6 @@ func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, err
if err = SyncReleasesWithTags(repo, gitRepo); err != nil {
log.Error(4, "Failed to synchronize tags to releases for repository: %v", err)
}
UpdateRepoIndexer(repo)
}

if err = repo.UpdateSize(); err != nil {
Expand All @@ -1053,10 +1052,16 @@ func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, err
}

repo.IsMirror = true
return repo, UpdateRepository(repo, false)
err = UpdateRepository(repo, false)
} else {
repo, err = CleanUpMigrateInfo(repo)
}

if err != nil && !repo.IsBare {
UpdateRepoIndexer(repo)
}

return CleanUpMigrateInfo(repo)
return repo, err
}

// cleanUpMigrateGitConfig removes mirror info which prevents "push --all".
Expand Down