Skip to content

Use per package global lock for container uploads instead of memory lock #31860

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 11 commits into from
Oct 11, 2024
Merged

Use per package global lock for container uploads instead of memory lock #31860

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7858fe2
Use per package lock
lunny Aug 18, 2024
96ec57c
Fix bug
lunny Aug 18, 2024
c34cc96
Merge branch 'main' into lunny/lock_per_package
lunny Aug 26, 2024
87c7405
use globallock lock
lunny Aug 26, 2024
50e6929
Merge branch 'main' into lunny/lock_per_package
lafriks Sep 6, 2024
953c32e
Merge branch 'main' into lunny/lock_per_package
lunny Sep 6, 2024
88c6e40
Fix bug
lunny Sep 6, 2024
e815da2
Merge branch 'lunny/lock_per_package' of github.com:lunny/gitea into …
lunny Sep 6, 2024
180b3c7
Fix package lock key which should be related to owner id and package …
lunny Sep 24, 2024
465b372
Merge branch 'main' into lunny/lock_per_package
lunny Sep 24, 2024
ee25630
Merge branch 'main' into lunny/lock_per_package
GiteaBot Oct 11, 2024
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
8 changes: 4 additions & 4 deletions routers/api/packages/container/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import (
"fmt"
"os"
"strings"
"sync"

"code.gitea.io/gitea/models/db"
packages_model "code.gitea.io/gitea/models/packages"
container_model "code.gitea.io/gitea/models/packages/container"
"code.gitea.io/gitea/modules/log"
packages_module "code.gitea.io/gitea/modules/packages"
container_module "code.gitea.io/gitea/modules/packages/container"
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/util"
packages_service "code.gitea.io/gitea/services/packages"
)

var uploadVersionMutex sync.Mutex
var uploadVersionMutex = sync.NewStatusTable()

// saveAsPackageBlob creates a package blob from an upload
// The uploaded blob gets stored in a special upload version to link them to the package/image
Expand Down Expand Up @@ -95,7 +95,8 @@ func getOrCreateUploadVersion(ctx context.Context, pi *packages_service.PackageI

// FIXME: Replace usage of mutex with database transaction
// https://github.com/go-gitea/gitea/pull/21862
uploadVersionMutex.Lock()
uploadVersionMutex.Start(strings.ToLower(pi.Name))
defer uploadVersionMutex.Stop(strings.ToLower(pi.Name))
err := db.WithTx(ctx, func(ctx context.Context) error {
created := true
p := &packages_model.Package{
Expand Down Expand Up @@ -140,7 +141,6 @@ func getOrCreateUploadVersion(ctx context.Context, pi *packages_service.PackageI

return nil
})
uploadVersionMutex.Unlock()

return uploadVersion, err
}
Expand Down