Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-05 01:59:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12547 from kofj/fix-transaction

Browse Source 
Fix: preheat install update transaction.
This commit is contained in:
Steven Zou 2020-07-24 16:33:29 +08:00 committed by GitHub
commit cafb2e819c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pkg/p2p/preheat/dao/instance/dao.go
View File

@ -4,7 +4,6 @@ import (
"context"
beego_orm "github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/lib/errors"
"github.com/goharbor/harbor/src/lib/orm"
"github.com/goharbor/harbor/src/lib/q"
"github.com/goharbor/harbor/src/pkg/p2p/preheat/models/provider"
@ -89,13 +88,10 @@ func (d *dao) GetByName(ctx context.Context, name string) (instance *provider.In
// Update updates distribution instance.
func (d *dao) Update(ctx context.Context, instance *provider.Instance, props ...string) error {
var o, err = orm.FromContext(ctx)
var trans = func(ctx context.Context) (err error) {
o, err := orm.FromContext(ctx)
if err != nil {
return err
}
err = o.Begin()
if err != nil {
return err
return
}
// check default instances first
@ -104,10 +100,7 @@ func (d *dao) Update(ctx context.Context, instance *provider.Instance, props ...
_, err = o.Raw("UPDATE ? SET default = false WHERE id != ?", instance.TableName(), instance.ID).Exec()
if err != nil {
if e := o.Rollback(); e != nil {
err = errors.Wrap(e, err.Error())
}
return err
return
}
break
@ -115,14 +108,10 @@ func (d *dao) Update(ctx context.Context, instance *provider.Instance, props ...
}
_, err = o.Update(instance, props...)
if err != nil {
if e := o.Rollback(); e != nil {
err = errors.Wrap(e, err.Error())
return
}
} else {
err = o.Commit()
}
return err
return orm.WithTransaction(trans)(ctx)
}
// Delete deletes one distribution instance by id.