Automatic merge from release/2.3.0 -> release/2.4.0

* commit 'ad9c026519b7866bce825f0cae888b1ef9c1ad1b':
  避免删除机器时，云端eip已经删除时，无限删除失败

pkg/compute/tasks/eip_dissociate_task.go

@@ -8,6 +8,7 @@ import (
 
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/compute/models"
 )
 
@@ -38,13 +39,13 @@ func (self *EipDissociateTask) OnInit(ctx context.Context, obj db.IStandaloneMod
 		}
 
 		extEip, err := eip.GetIEip()
-		if err != nil {
+		if err != nil && err != cloudprovider.ErrNotFound {
 			msg := fmt.Sprintf("fail to find iEIP for eip %s", err)
 			self.TaskFail(ctx, eip, msg, server)
 			return
 		}
 
-		if len(extEip.GetAssociationExternalId()) > 0 {
+		if err == nil && len(extEip.GetAssociationExternalId()) > 0 {
 			err = extEip.Dissociate()
 			if err != nil {
 				msg := fmt.Sprintf("fail to remote dissociate eip %s", err)