fix: do not lock guest after lock eip, to prevent possible dead lock

This commit is contained in:
Qiu Jian
2020-10-19 11:42:28 +08:00
parent db9872e9fa
commit 0466b2c805
+2 -3
View File
@@ -23,7 +23,6 @@ import (
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/compute/models"
@@ -85,8 +84,8 @@ func (self *EipDissociateTask) OnInit(ctx context.Context, obj db.IStandaloneMod
self.TaskFail(ctx, eip, jsonutils.NewString("unsupported associate type"), nil)
return
}
lockman.LockObject(ctx, model)
defer lockman.ReleaseObject(ctx, model)
// lockman.LockObject(ctx, model)
// defer lockman.ReleaseObject(ctx, model)
if eip.IsManaged() {
extEip, err := eip.GetIEip()