Skip to content

Keep database transactions not too big #13254

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
techknowlogick merged 6 commits into from
Oct 22, 2020
Merged

Keep database transactions not too big #13254

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c808a5d
Keep database transactions not too big
lunny Oct 22, 2020
0ae7bd2
Fix #13255
zeripath Oct 22, 2020
bf7b43a
Merge pull request #9 from zeripath/lunny/release_commit
lunny Oct 22, 2020
199bf5d
Only cache the last repo
zeripath Oct 22, 2020
f07b220
Merge pull request #10 from zeripath/lunny/release_commit
lunny Oct 22, 2020
f1582a4
Merge branch 'master' into lunny/release_commit
zeripath Oct 22, 2020
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
55 changes: 33 additions & 22 deletions models/migrations/v156.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strings"

"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

"xorm.io/xorm"
Expand All @@ -35,9 +36,10 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
}

type Repository struct {
ID int64
OwnerID int64
Name string
ID int64
OwnerID int64
OwnerName string
Name string
}

type User struct {
Expand All @@ -50,15 +52,10 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
sess := x.NewSession()
defer sess.Close()

if err := sess.Begin(); err != nil {
return err
}

var (
gitRepoCache = make(map[int64]*git.Repository)
Copy link
Contributor

@zeripath zeripath Oct 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may need to limit the size of this or... perhaps even better just order the releases by repository ID

gitRepo *git.Repository
repoCache = make(map[int64]*Repository)
userCache = make(map[int64]*User)
ok bool
err error
)
Expand All @@ -70,6 +67,10 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
for start := 0; ; start += batchSize {
releases := make([]*Release, 0, batchSize)

if err := sess.Begin(); err != nil {
return err
}

if err := sess.Limit(batchSize, start).Asc("id").Where("is_tag=?", true).Find(&releases); err != nil {
return err
}
Expand All @@ -88,26 +89,32 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
if err != nil {
return err
} else if !has {
return fmt.Errorf("Repository %d is not exist", release.RepoID)
log.Warn("Release[%d] is orphaned and refers to non-existing repository %d", release.ID, release.RepoID)
log.Warn("This release should be deleted")
continue
}

repoCache[release.RepoID] = repo
}
if repo.OwnerName == "" {
// v120.go migration may not have been run correctly - we'll just replicate it here
// because this appears to be a common-ish problem.
if _, err := sess.Exec("UPDATE repository SET owner_name = (SELECT name FROM `user` WHERE `user`.id = repository.owner_id)"); err != nil {
return err
}

user, ok := userCache[repo.OwnerID]
if !ok {
user = new(User)
has, err := sess.ID(repo.OwnerID).Get(user)
if err != nil {
return err
} else if !has {
return fmt.Errorf("User %d is not exist", repo.OwnerID)
if _, err := sess.ID(release.RepoID).Get(repo); err != nil {
return err
}
}

userCache[repo.OwnerID] = user
repoCache[release.RepoID] = repo
}

if repo.OwnerName == "" {
log.Warn("Release[%d] refers to Repo[%d] Name: %s with OwnerID: %d but does not have OwnerName set", release.ID, release.RepoID, repo.Name, repo.OwnerID)
continue
}

gitRepo, err = git.OpenRepository(repoPath(user.Name, repo.Name))
gitRepo, err = git.OpenRepository(repoPath(repo.OwnerName, repo.Name))
if err != nil {
return err
}
Expand All @@ -134,7 +141,11 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
return err
}
}

if err := sess.Commit(); err != nil {
return err
}
}

return sess.Commit()
return nil
}