From 0466b2c805b34cb69dc8f9db7f334c7c9481a7c3 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 19 Oct 2020 10:29:15 +0800 Subject: [PATCH] fix: do not lock guest after lock eip, to prevent possible dead lock --- pkg/compute/tasks/eip_dissociate_task.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/compute/tasks/eip_dissociate_task.go b/pkg/compute/tasks/eip_dissociate_task.go index 9f1d11a5fe..fc8aae7ad8 100644 --- a/pkg/compute/tasks/eip_dissociate_task.go +++ b/pkg/compute/tasks/eip_dissociate_task.go @@ -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()