fix

Author: wxiaoguang

models/packages/package.go

@@ -122,21 +122,30 @@ type Package struct {
 func TryInsertPackage(ctx context.Context, p *Package) (*Package, error) {
 	e := db.GetEngine(ctx)
 
-	key := &Package{
+	pkg := &Package{
 		OwnerID:   p.OwnerID,
 		Type:      p.Type,
 		LowerName: p.LowerName,
 	}
 
-	has, err := e.Get(key)
+	has, err := e.Get(pkg)
 	if err != nil {
 		return nil, err
 	}
 	if has {
-		return key, ErrDuplicatePackage
+		return pkg, ErrDuplicatePackage
 	}
-	if _, err = e.Insert(p); err != nil {
-		return nil, err
+	if _, errIns := e.Insert(p); errIns != nil {
+		// there could be concurrent inserts, if the package record already exists, try to query it again
+		has, err = e.Get(pkg)
+		if err != nil {
+			return nil, err
+		}
+		if has {
+			return pkg, ErrDuplicatePackage
+		}
+		// if there is still no package record, return the original insert error
+		return nil, errIns
 	}
 	return p, nil
 }

models/packages/package_blob.go

@@ -42,8 +42,15 @@ func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool,
 	if has {
 		return pb, true, nil
 	}
-	if _, err = e.Insert(pb); err != nil {
-		return nil, false, err
+	if _, errIns := e.Insert(pb); errIns != nil {
+		has, err = e.Get(pb)
+		if err != nil {
+			return nil, false, err
+		}
+		if has {
+			return pb, true, nil
+		}
+		return nil, false, errIns
 	}
 	return pb, false, nil
 }

models/packages/package_file.go

@@ -47,21 +47,28 @@ type PackageFile struct {
 func TryInsertFile(ctx context.Context, pf *PackageFile) (*PackageFile, error) {
 	e := db.GetEngine(ctx)
 
-	key := &PackageFile{
+	pkgFile := &PackageFile{
 		VersionID:    pf.VersionID,
 		LowerName:    pf.LowerName,
 		CompositeKey: pf.CompositeKey,
 	}
 
-	has, err := e.Get(key)
+	has, err := e.Get(pkgFile)
 	if err != nil {
 		return nil, err
 	}
 	if has {
-		return pf, ErrDuplicatePackageFile
+		return pkgFile, ErrDuplicatePackageFile
 	}
-	if _, err = e.Insert(pf); err != nil {
-		return nil, err
+	if _, errIns := e.Insert(pf); errIns != nil {
+		has, err = e.Get(pkgFile)
+		if err != nil {
+			return nil, err
+		}
+		if has {
+			return pkgFile, ErrDuplicatePackageFile
+		}
+		return nil, errIns
 	}
 	return pf, nil
 }

models/packages/package_version.go

@@ -41,20 +41,27 @@ type PackageVersion struct {
 func GetOrInsertVersion(ctx context.Context, pv *PackageVersion) (*PackageVersion, error) {
 	e := db.GetEngine(ctx)
 
-	key := &PackageVersion{
+	pkgVer := &PackageVersion{
 		PackageID:    pv.PackageID,
 		LowerVersion: pv.LowerVersion,
 	}
 
-	has, err := e.Get(key)
+	has, err := e.Get(pkgVer)
 	if err != nil {
 		return nil, err
 	}
 	if has {
-		return key, ErrDuplicatePackageVersion
+		return pkgVer, ErrDuplicatePackageVersion
 	}
-	if _, err = e.Insert(pv); err != nil {
-		return nil, err
+	if _, errIns := e.Insert(pv); errIns != nil {
+		has, err = e.Get(pkgVer)
+		if err != nil {
+			return nil, err
+		}
+		if has {
+			return pkgVer, ErrDuplicatePackageVersion
+		}
+		return nil, errIns
 	}
 	return pv, nil
 }

routers/api/packages/container/blob.go

@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"sync"
 
 	"code.gitea.io/gitea/models/db"
 	packages_model "code.gitea.io/gitea/models/packages"
@@ -23,8 +22,6 @@ import (
 	packages_service "code.gitea.io/gitea/services/packages"
 )
 
-var uploadVersionMutex sync.Mutex
-
 // 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(hsr packages_module.HashedSizeReader, pi *packages_service.PackageInfo) (*packages_model.PackageBlob, error) {
@@ -34,9 +31,6 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pi *packages_servic
 
 	contentStore := packages_module.NewContentStore()
 
-	var uploadVersion *packages_model.PackageVersion
-
-	uploadVersionMutex.Lock()
 	err := db.WithTx(db.DefaultContext, func(ctx context.Context) error {
 		created := true
 		p := &packages_model.Package{
@@ -77,16 +71,6 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pi *packages_servic
 			}
 		}
 
-		uploadVersion = pv
-
-		return nil
-	})
-	uploadVersionMutex.Unlock()
-	if err != nil {
-		return nil, err
-	}
-
-	err = db.WithTx(db.DefaultContext, func(ctx context.Context) error {
 		pb, exists, err = packages_model.GetOrInsertBlob(ctx, pb)
 		if err != nil {
 			log.Error("Error inserting package blob: %v", err)
@@ -111,7 +95,7 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pi *packages_servic
 		filename := strings.ToLower(fmt.Sprintf("sha256_%s", pb.HashSHA256))
 
 		pf := &packages_model.PackageFile{
-			VersionID:    uploadVersion.ID,
+			VersionID:    pv.ID,
 			BlobID:       pb.ID,
 			Name:         filename,
 			LowerName:    filename,