opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): redis master zone empty fix

Browse Source
This commit is contained in:
TangBin
2020-12-07 14:54:11 +08:00
parent db20769cf2
commit 485cf8b3c8
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aliyun/elasticcache_instance.go
+3 -1
View File
@@ -246,11 +246,13 @@ func (self *SElasticcache) GetVpcId() string {
}
func (self *SElasticcache) GetZoneId() string {
zone, err := self.region.getZoneById(transZoneIdToEcsZoneId(self.region, "redis", self.ZoneID))
zoneId := transZoneIdToEcsZoneId(self.region, "redis", self.ZoneID)
zone, err := self.region.getZoneById(fetchMasterZoneId(zoneId))
if err != nil {
log.Errorf("failed to find zone for elasticcache %s error: %v", self.GetId(), err)
return ""
}
return zone.GetGlobalId()
}
pkg/multicloud/aliyun/loadbalancer.go
+14
View File
@@ -479,3 +479,17 @@ func transRegionIdFromEcsRegionId(region *SRegion, service string) string {
return region.GetId()
}
func fetchMasterZoneId(zoneId string) string {
// cn-shenzhen-finance-1MAZ2(d,e)
i := strings.Index(zoneId, "MAZ")
if i > 0 {
s := strings.Index(zoneId, "(")
e := strings.Index(zoneId, ",")
if s >= 0 && e >= 0 {
return zoneId[0:i] + zoneId[s+1:e]
}
}
return zoneId
}