Skip to content

Commit b1e1385

Browse files
zeripath6543
andauthored
Prevent migration 156 failure if tag commit missing (#15519)
It is possible that tag commits could be deleted or missing from repos. This causes migration 156 to fail and breaks upgrade. This PR simply logs the failure. Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: 6543 <[email protected]>
1 parent 324cff6 commit b1e1385

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

models/migrations/v156.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
8888
repo = new(Repository)
8989
has, err := sess.ID(release.RepoID).Get(repo)
9090
if err != nil {
91+
log.Error("Error whilst loading repository[%d] for release[%d] with tag name %s", release.RepoID, release.ID, release.TagName)
9192
return err
9293
} else if !has {
9394
log.Warn("Release[%d] is orphaned and refers to non-existing repository %d", release.ID, release.RepoID)
@@ -99,28 +100,37 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
99100
// v120.go migration may not have been run correctly - we'll just replicate it here
100101
// because this appears to be a common-ish problem.
101102
if _, err := sess.Exec("UPDATE repository SET owner_name = (SELECT name FROM `user` WHERE `user`.id = repository.owner_id)"); err != nil {
103+
log.Error("Error whilst updating repository[%d] owner name", repo.ID)
102104
return err
103105
}
104106

105107
if _, err := sess.ID(release.RepoID).Get(repo); err != nil {
108+
log.Error("Error whilst loading repository[%d] for release[%d] with tag name %s", release.RepoID, release.ID, release.TagName)
106109
return err
107110
}
108111
}
109112
gitRepo, err = git.OpenRepository(repoPath(repo.OwnerName, repo.Name))
110113
if err != nil {
114+
log.Error("Error whilst opening git repo for %-v", repo)
111115
return err
112116
}
113117
}
114118

115119
commit, err := gitRepo.GetTagCommit(release.TagName)
116120
if err != nil {
121+
if git.IsErrNotExist(err) {
122+
log.Warn("Unable to find commit %s for Tag: %s in %-v. Cannot update publisher ID.", err.(*git.ErrNotExist).ID, release.TagName, repo)
123+
continue
124+
}
125+
log.Error("Error whilst getting commit for Tag: %s in %-v.", release.TagName, repo)
117126
return fmt.Errorf("GetTagCommit: %v", err)
118127
}
119128

120129
if user == nil || !strings.EqualFold(user.Email, commit.Author.Email) {
121130
user = new(User)
122131
_, err = sess.Where("email=?", commit.Author.Email).Get(user)
123132
if err != nil {
133+
log.Error("Error whilst getting commit author by email: %s for Tag: %s in %-v.", commit.Author.Email, release.TagName, repo)
124134
return err
125135
}
126136

@@ -133,6 +143,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
133143

134144
release.PublisherID = user.ID
135145
if _, err := sess.ID(release.ID).Cols("publisher_id").Update(release); err != nil {
146+
log.Error("Error whilst updating publisher[%d] for release[%d] with tag name %s", release.PublisherID, release.ID, release.TagName)
136147
return err
137148
}
138149
}

0 commit comments

Comments
 (0)