From 7858fe22372132d4780a1fff446941fadde9c86d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 17 Aug 2024 22:18:55 -0700 Subject: [PATCH 1/3] Use per package lock --- routers/api/packages/container/blob.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 9e3a47076c..334f878bcb 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -10,7 +10,6 @@ import ( "fmt" "os" "strings" - "sync" "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" @@ -18,11 +17,12 @@ import ( "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 @@ -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{ @@ -140,7 +141,6 @@ func getOrCreateUploadVersion(ctx context.Context, pi *packages_service.PackageI return nil }) - uploadVersionMutex.Unlock() return uploadVersion, err } From 96ec57c3e58aa6f8db873024dfd8c6155fe1680a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 18 Aug 2024 10:12:02 -0700 Subject: [PATCH 2/3] Fix bug --- routers/api/packages/container/blob.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 334f878bcb..49828d6612 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -22,7 +22,7 @@ import ( packages_service "code.gitea.io/gitea/services/packages" ) -var uploadVersionMutex = sync.NewStatusTable() +var uploadVersionMutex = sync.NewExclusivePool() // 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 @@ -95,8 +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.Start(strings.ToLower(pi.Name)) - defer uploadVersionMutex.Stop(strings.ToLower(pi.Name)) + uploadVersionMutex.CheckIn(strings.ToLower(pi.Name)) + defer uploadVersionMutex.CheckOut(strings.ToLower(pi.Name)) err := db.WithTx(ctx, func(ctx context.Context) error { created := true p := &packages_model.Package{ From 87c7405bc607a40805e389982952ab733d6278ce Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 26 Aug 2024 11:10:29 -0700 Subject: [PATCH 3/3] use globallock lock --- routers/api/packages/container/blob.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 49828d6612..e178322d62 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -14,16 +14,14 @@ import ( "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/globallock" "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.NewExclusivePool() - // 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 func saveAsPackageBlob(ctx context.Context, hsr packages_module.HashedSizeReader, pci *packages_service.PackageCreationInfo) (*packages_model.PackageBlob, error) { //nolint:unparam @@ -90,14 +88,20 @@ func mountBlob(ctx context.Context, pi *packages_service.PackageInfo, pb *packag }) } +func containerPkgName(piName string) string { + return "pkg_container_" + strings.ToLower(piName) +} + func getOrCreateUploadVersion(ctx context.Context, pi *packages_service.PackageInfo) (*packages_model.PackageVersion, error) { var uploadVersion *packages_model.PackageVersion - // FIXME: Replace usage of mutex with database transaction - // https://github.com/go-gitea/gitea/pull/21862 - uploadVersionMutex.CheckIn(strings.ToLower(pi.Name)) - defer uploadVersionMutex.CheckOut(strings.ToLower(pi.Name)) - err := db.WithTx(ctx, func(ctx context.Context) error { + ctx, releaser, err := globallock.Lock(ctx, containerPkgName(pi.Name)) + if err != nil { + return nil, err + } + defer releaser() + + err = db.WithTx(ctx, func(ctx context.Context) error { created := true p := &packages_model.Package{ OwnerID: pi.Owner.ID,