Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-11 09:15:31 +02:00
Code Issues Activity

fix: remove retry helper, modernize loops and waitgroup usage

Browse Source 
Signed-off-by: Mohit25022005 <mohitswarnkar13@gmail.com>
This commit is contained in:
Mohit25022005 2026-05-07 14:03:44 +00:00
parent 8de3662112
commit bda7281fcb
3 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/auth/source/oauth2/source_group_sync_test.go
View File

@ -32,16 +32,13 @@ func TestSyncGroupsToTeamsConcurrentRuns(t *testing.T) {
}
var wg sync.WaitGroup
for i := 0; i < 10; i++ {
wg.Add(2)
go func() {
defer wg.Done()
for range 10 {
wg.Go(func() {
assert.NoError(t, auth_source.SyncGroupsToTeams(ctx, user, container.SetOf("ldap-group"), sourceGroupTeamMapping, true))
}()
go func() {
defer wg.Done()
})
wg.Go(func() {
assert.NoError(t, auth_source.SyncGroupsToTeams(ctx, user, container.Set[string]{}, sourceGroupTeamMapping, true))
}()
})
}
wg.Wait()

36
services/org/team.go
View File

@ -8,7 +8,6 @@ import (
"errors"
"fmt"
"strings"
"time"
"code.gitea.io/gitea/models/db"
git_model "code.gitea.io/gitea/models/git"
@ -225,7 +224,7 @@ func AddTeamMember(ctx context.Context, team *organization.Team, user *user_mode
return err
}
err = withTeamMembershipTxRetry(ctx, func(ctx context.Context) error {
err = db.WithTx(ctx, func(ctx context.Context) error {
// check in transaction
isAlreadyMember, err = organization.IsTeamMember(ctx, team.OrgID, team.ID, user.ID)
if err != nil || isAlreadyMember {
@ -359,38 +358,7 @@ func removeInvalidOrgUser(ctx context.Context, orgID int64, user *user_model.Use
// RemoveTeamMember removes member from given team of given organization.
func RemoveTeamMember(ctx context.Context, team *organization.Team, user *user_model.User) error {
return withTeamMembershipTxRetry(ctx, func(ctx context.Context) error {
return db.WithTx(ctx, func(ctx context.Context) error {
return removeTeamMember(ctx, team, user)
})
}
func withTeamMembershipTxRetry(parentCtx context.Context, f func(ctx context.Context) error) error {
const maxAttempts = 3
var err error
for i := 0; i < maxAttempts; i++ {
err = db.WithTx(parentCtx, f)
if err == nil || !isRetriableTeamMembershipTxError(err) || i == maxAttempts-1 {
return err
}
time.Sleep(time.Duration(i+1) * 10 * time.Millisecond)
}
return err
}
func isRetriableTeamMembershipTxError(err error) bool {
msg := strings.ToLower(err.Error())
if strings.Contains(msg, "deadlock") || strings.Contains(msg, "serialization failure") {
return true
}
// SQLSTATE 40P01
if strings.Contains(msg, "40p01") {
return true
}
// MySQL ER_LOCK_DEADLOCK and MSSQL deadlock victim are frequently surfaced as numeric codes in error text.
for _, code := range []string{"1213", "1205"} {
if strings.Contains(msg, " "+code+" ") || strings.Contains(msg, ":"+code) || strings.Contains(msg, "("+code+")") {
return true
}
}
return false
}

16
services/org/team_test.go
View File

@ -339,12 +339,10 @@ func TestTeamMemberConcurrentAddRemoveIdempotent(t *testing.T) {
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
var wg sync.WaitGroup
for i := 0; i < 8; i++ {
wg.Add(1)
go func() {
defer wg.Done()
for range 8 {
wg.Go(func() {
assert.NoError(t, AddTeamMember(ctx, team, user))
}()
})
}
wg.Wait()
@ -352,12 +350,10 @@ func TestTeamMemberConcurrentAddRemoveIdempotent(t *testing.T) {
assert.NoError(t, err)
assert.EqualValues(t, 1, count)
for i := 0; i < 8; i++ {
wg.Add(1)
go func() {
defer wg.Done()
for range 8 {
wg.Go(func() {
assert.NoError(t, RemoveTeamMember(ctx, team, user))
}()
})
}
wg.Wait()