aboutsummaryrefslogtreecommitdiffstats
path: root/models/commit_status.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2021-09-23 18:50:06 +0800
committerGitHub <noreply@github.com>2021-09-23 18:50:06 +0800
commitd9c69596fff1a1482cbc15ac220f9d5e1829a5ea (patch)
tree1e39fa59ad38cdd9a0a9c3a1f3e4bc331bed405e /models/commit_status.go
parentd9e237e3f268d786af028ba8e7cc24f70a6d6a36 (diff)
downloadgitea-d9c69596fff1a1482cbc15ac220f9d5e1829a5ea.tar.gz
gitea-d9c69596fff1a1482cbc15ac220f9d5e1829a5ea.zip
Fix commit status index problem (#17061)
* Fix commit status index problem * remove unused functions * Add fixture and test for migration * Fix lint * Fix fixture * Fix lint * Fix test * Fix bug * Fix bug
Diffstat (limited to 'models/commit_status.go')
-rw-r--r--models/commit_status.go107
1 files changed, 91 insertions, 16 deletions
diff --git a/models/commit_status.go b/models/commit_status.go
index f3639e819e..7ec233e80d 100644
--- a/models/commit_status.go
+++ b/models/commit_status.go
@@ -40,6 +40,82 @@ type CommitStatus struct {
func init() {
db.RegisterModel(new(CommitStatus))
+ db.RegisterModel(new(CommitStatusIndex))
+}
+
+// upsertCommitStatusIndex the function will not return until it acquires the lock or receives an error.
+func upsertCommitStatusIndex(e db.Engine, repoID int64, sha string) (err error) {
+ // An atomic UPSERT operation (INSERT/UPDATE) is the only operation
+ // that ensures that the key is actually locked.
+ switch {
+ case setting.Database.UseSQLite3 || setting.Database.UsePostgreSQL:
+ _, err = e.Exec("INSERT INTO `commit_status_index` (repo_id, sha, max_index) "+
+ "VALUES (?,?,1) ON CONFLICT (repo_id,sha) DO UPDATE SET max_index = `commit_status_index`.max_index+1",
+ repoID, sha)
+ case setting.Database.UseMySQL:
+ _, err = e.Exec("INSERT INTO `commit_status_index` (repo_id, sha, max_index) "+
+ "VALUES (?,?,1) ON DUPLICATE KEY UPDATE max_index = max_index+1",
+ repoID, sha)
+ case setting.Database.UseMSSQL:
+ // https://weblogs.sqlteam.com/dang/2009/01/31/upsert-race-condition-with-merge/
+ _, err = e.Exec("MERGE `commit_status_index` WITH (HOLDLOCK) as target "+
+ "USING (SELECT ? AS repo_id, ? AS sha) AS src "+
+ "ON src.repo_id = target.repo_id AND src.sha = target.sha "+
+ "WHEN MATCHED THEN UPDATE SET target.max_index = target.max_index+1 "+
+ "WHEN NOT MATCHED THEN INSERT (repo_id, sha, max_index) "+
+ "VALUES (src.repo_id, src.sha, 1);",
+ repoID, sha)
+ default:
+ return fmt.Errorf("database type not supported")
+ }
+ return
+}
+
+// GetNextCommitStatusIndex retried 3 times to generate a resource index
+func GetNextCommitStatusIndex(repoID int64, sha string) (int64, error) {
+ for i := 0; i < db.MaxDupIndexAttempts; i++ {
+ idx, err := getNextCommitStatusIndex(repoID, sha)
+ if err == db.ErrResouceOutdated {
+ continue
+ }
+ if err != nil {
+ return 0, err
+ }
+ return idx, nil
+ }
+ return 0, db.ErrGetResourceIndexFailed
+}
+
+// getNextCommitStatusIndex return the next index
+func getNextCommitStatusIndex(repoID int64, sha string) (int64, error) {
+ ctx, commiter, err := db.TxContext()
+ if err != nil {
+ return 0, err
+ }
+ defer commiter.Close()
+
+ var preIdx int64
+ _, err = ctx.Engine().SQL("SELECT max_index FROM `commit_status_index` WHERE repo_id = ? AND sha = ?", repoID, sha).Get(&preIdx)
+ if err != nil {
+ return 0, err
+ }
+
+ if err := upsertCommitStatusIndex(ctx.Engine(), repoID, sha); err != nil {
+ return 0, err
+ }
+
+ var curIdx int64
+ has, err := ctx.Engine().SQL("SELECT max_index FROM `commit_status_index` WHERE repo_id = ? AND sha = ? AND max_index=?", repoID, sha, preIdx+1).Get(&curIdx)
+ if err != nil {
+ return 0, err
+ }
+ if !has {
+ return 0, db.ErrResouceOutdated
+ }
+ if err := commiter.Commit(); err != nil {
+ return 0, err
+ }
+ return curIdx, nil
}
func (status *CommitStatus) loadAttributes(e db.Engine) (err error) {
@@ -142,6 +218,14 @@ func sortCommitStatusesSession(sess *xorm.Session, sortType string) {
}
}
+// CommitStatusIndex represents a table for commit status index
+type CommitStatusIndex struct {
+ ID int64
+ RepoID int64 `xorm:"unique(repo_sha)"`
+ SHA string `xorm:"unique(repo_sha)"`
+ MaxIndex int64 `xorm:"index"`
+}
+
// GetLatestCommitStatus returns all statuses with a unique context for a given commit.
func GetLatestCommitStatus(repoID int64, sha string, listOptions ListOptions) ([]*CommitStatus, error) {
return getLatestCommitStatus(db.DefaultContext().Engine(), repoID, sha, listOptions)
@@ -206,6 +290,12 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {
return fmt.Errorf("NewCommitStatus[%s, %s]: no user specified", repoPath, opts.SHA)
}
+ // Get the next Status Index
+ idx, err := GetNextCommitStatusIndex(opts.Repo.ID, opts.SHA)
+ if err != nil {
+ return fmt.Errorf("generate commit status index failed: %v", err)
+ }
+
ctx, committer, err := db.TxContext()
if err != nil {
return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %v", opts.Repo.ID, opts.Creator.ID, opts.SHA, err)
@@ -218,22 +308,7 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {
opts.CommitStatus.SHA = opts.SHA
opts.CommitStatus.CreatorID = opts.Creator.ID
opts.CommitStatus.RepoID = opts.Repo.ID
-
- // Get the next Status Index
- var nextIndex int64
- lastCommitStatus := &CommitStatus{
- SHA: opts.SHA,
- RepoID: opts.Repo.ID,
- }
- has, err := ctx.Engine().Desc("index").Limit(1).Get(lastCommitStatus)
- if err != nil {
- return fmt.Errorf("NewCommitStatus[%s, %s]: %v", repoPath, opts.SHA, err)
- }
- if has {
- log.Debug("NewCommitStatus[%s, %s]: found", repoPath, opts.SHA)
- nextIndex = lastCommitStatus.Index
- }
- opts.CommitStatus.Index = nextIndex + 1
+ opts.CommitStatus.Index = idx
log.Debug("NewCommitStatus[%s, %s]: %d", repoPath, opts.SHA, opts.CommitStatus.Index)
opts.CommitStatus.ContextHash = hashCommitStatusContext(opts.CommitStatus.Context)