opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3700 from ioito/hotfix/qx-dbinstance-zone

Browse Source 
fix: 避免仅返回一个zone信息
This commit is contained in:
yunion-ci-robot
2019-11-18 09:17:21 +08:00
committed by GitHub
parent e05ba0d0bb 51fc33a5e4
commit 222fa44e8c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dbinstances.go
+11 -8
View File
@@ -369,11 +369,11 @@ type sDBInstanceZone struct {
Name string
}
func fetchDBInstanceZones(rdsIds []string) map[string]sDBInstanceZone {
func fetchDBInstanceZones(rdsIds []string) map[string][]sDBInstanceZone {
instances := DBInstanceManager.Query().SubQuery()
zones := ZoneManager.Query().SubQuery()
result := map[string]sDBInstanceZone{}
result := map[string][]sDBInstanceZone{}
for _, zone := range []string{"zone1", "zone2", "zone3"} {
zoneInfo := []struct {
@@ -394,11 +394,12 @@ func fetchDBInstanceZones(rdsIds []string) map[string]sDBInstanceZone {
for _, _zone := range zoneInfo {
if _, ok := result[_zone.InstanceId]; !ok {
result[_zone.InstanceId] = sDBInstanceZone{
Id: fmt.Sprintf("%s_name", zone),
Name: _zone.Name,
}
result[_zone.InstanceId] = []sDBInstanceZone{}
}
result[_zone.InstanceId] = append(result[_zone.InstanceId], sDBInstanceZone{
Id: fmt.Sprintf("%s_name", zone),
Name: _zone.Name,
})
}
}
@@ -415,8 +416,10 @@ func (manager *SDBInstanceManager) FetchCustomizeColumns(ctx context.Context, us
zoneInfo := fetchDBInstanceZones(rdsIds)
if zoneInfo != nil {
for i := range rows {
if zone, ok := zoneInfo[objs[i].GetId()]; ok {
rows[i].Add(jsonutils.NewString(zone.Name), zone.Id)
if zones, ok := zoneInfo[objs[i].GetId()]; ok {
for _, zone := range zones {
rows[i].Add(jsonutils.NewString(zone.Name), zone.Id)
}
}
}
}