opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7882 from ioito/automated-cherry-pick-of-#7879-upstream-release-3.2

Browse Source 
Automated cherry pick of #7879: fix: avoid sync natgateway eip panic
This commit is contained in:
Zexi Li
2020-09-11 21:03:57 +08:00
committed by GitHub
parent 2e560c1f04 545f9eebf1
commit 4868674fee
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+4 -1
View File
@@ -421,8 +421,11 @@ func (self *SElasticip) SyncInstanceWithCloudEip(ctx context.Context, userCred m
case api.EIP_ASSOCIATE_TYPE_SERVER:
sq := HostManager.Query().SubQuery()
return q.Join(sq, sqlchemy.Equals(sq.Field("id"), q.Field("host_id"))).Filter(sqlchemy.Equals(sq.Field("manager_id"), self.ManagerId))
case api.EIP_ASSOCIATE_TYPE_NAT_GATEWAY, api.EIP_ASSOCIATE_TYPE_LOADBALANCER:
case api.EIP_ASSOCIATE_TYPE_LOADBALANCER:
return q.Equals("manager_id", self.ManagerId)
case api.EIP_ASSOCIATE_TYPE_NAT_GATEWAY:
sq := VpcManager.Query("id").Equals("manager_id", self.ManagerId)
return q.In("vpc_id", sq.SubQuery())
}
return q
})