Skip to content

Fix cocurrent upload package #21836

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

Closed
wants to merge 2 commits into from
Closed

Fix cocurrent upload package #21836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e19bbc
Fix cocunrrent upload packages
lunny Nov 16, 2022
3ec4b9b
Fix cocunrrent upload bloe/file/version
lunny Nov 16, 2022
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
9 changes: 8 additions & 1 deletion models/packages/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,21 @@ func TryInsertPackage(ctx context.Context, p *Package) (*Package, error) {
LowerName: p.LowerName,
}

has, err := e.Get(key)
has, err := e.Exist(key)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is wrong because Exist does not populate the object with the content from the database.

if err != nil {
return nil, err
}
if has {
return key, ErrDuplicatePackage
}
if _, err = e.Insert(p); err != nil {
has, err := e.Exist(key)
if err != nil {
return nil, err
}
if has {
return key, ErrDuplicatePackage
}
return nil, err
Comment on lines +139 to 146
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's wrong. You might get has=false, err=nil then return nil, nil

}
return p, nil
Expand Down
9 changes: 8 additions & 1 deletion models/packages/package_blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,21 @@ type PackageBlob struct {
func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool, error) {
e := db.GetEngine(ctx)

has, err := e.Get(pb)
has, err := e.Exist(pb)
if err != nil {
return nil, false, err
}
if has {
return pb, true, nil
}
if _, err = e.Insert(pb); err != nil {
has, err := e.Exist(pb)
if err != nil {
return nil, false, err
}
if has {
return pb, true, nil
}
return nil, false, err
}
return pb, false, nil
Expand Down
9 changes: 8 additions & 1 deletion models/packages/package_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,21 @@ func TryInsertFile(ctx context.Context, pf *PackageFile) (*PackageFile, error) {
CompositeKey: pf.CompositeKey,
}

has, err := e.Get(key)
has, err := e.Exist(key)
if err != nil {
return nil, err
}
if has {
return pf, ErrDuplicatePackageFile
}
if _, err = e.Insert(pf); err != nil {
has, err := e.Exist(key)
if err != nil {
return nil, err
}
if has {
return pf, ErrDuplicatePackageFile
}
return nil, err
}
return pf, nil
Expand Down
9 changes: 8 additions & 1 deletion models/packages/package_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,21 @@ func GetOrInsertVersion(ctx context.Context, pv *PackageVersion) (*PackageVersio
LowerVersion: pv.LowerVersion,
}

has, err := e.Get(key)
has, err := e.Exist(key)
if err != nil {
return nil, err
}
if has {
return key, ErrDuplicatePackageVersion
}
if _, err = e.Insert(pv); err != nil {
has, err := e.Exist(key)
if err != nil {
return nil, err
}
if has {
return key, ErrDuplicatePackageVersion
}
return nil, err
}
return pv, nil
Expand Down
5 changes: 2 additions & 3 deletions routers/api/packages/container/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pi *packages_servic
}
var err error
if p, err = packages_model.TryInsertPackage(ctx, p); err != nil {
if err == packages_model.ErrDuplicatePackage {
created = false
} else {
if err != packages_model.ErrDuplicatePackage {
log.Error("Error inserting package: %v", err)
return err
}
created = false
}

if created {
Expand Down