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

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit '1c9c74461ca4b9028780f553839e29b4c57b0c26':
  修复查询defautl region时guests count异常
This commit is contained in:
邱剑
2018-10-09 21:59:37 +08:00
parent e67fe9e69c 1c9c74461c
commit 6b25ce03b6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudregions.go
+4 -2
View File
@@ -72,11 +72,13 @@ func (self *SCloudregion) GetZoneCount() int {
}
func (self *SCloudregion) GetGuestCount(increment bool) int {
zoneTable := ZoneManager.Query("id").Equals("cloudregion_id", self.Id)
zoneTable := ZoneManager.Query("id")
if self.Id == "default" {
zoneTable = ZoneManager.Query("id").Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")),
zoneTable = zoneTable.Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")),
sqlchemy.IsEmpty(zoneTable.Field("cloudregion_id")),
sqlchemy.Equals(zoneTable.Field("cloudregion_id"), self.Id)))
} else {
zoneTable = zoneTable.Equals("cloudregion_id", self.Id)
}
sq := HostManager.Query("id").In("zone_id", zoneTable)
query := GuestManager.Query().In("host_id", sq)