From ca2e8bece32cd45698bbb6e104fcc6db10e53f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 25 Aug 2020 10:31:32 +0800 Subject: [PATCH] fix: ignore invalid zone sku for rds sku sync (#7617) Co-authored-by: Qu Xuan --- pkg/compute/models/skus_tools.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/skus_tools.go b/pkg/compute/models/skus_tools.go index fc1da233c2..76c74fcf00 100644 --- a/pkg/compute/models/skus_tools.go +++ b/pkg/compute/models/skus_tools.go @@ -72,9 +72,10 @@ func (self *SSkuResourcesMeta) GetDBInstanceSkusByRegionExternalId(regionExterna return nil, errors.Wrapf(err, "obj.Unmarshal") } if len(sku.Zone1) > 0 { - zoneId := self.getZoneIdBySuffix(zoneMaps, sku.Zone1) + zoneId := self.getZoneIdBySuffix(zoneMaps, sku.Zone1) // Huawei rds sku zone1 maybe is cn-north-4f if len(zoneId) == 0 { - return nil, fmt.Errorf("invalid sku %s %s zone1: %s", sku.Id, sku.CloudregionId, sku.Zone1) + log.Errorf("invalid sku %s(%s) %s zone1: %s", sku.Name, sku.Id, sku.CloudregionId, sku.Zone1) + continue } sku.Zone1 = zoneId } @@ -82,7 +83,8 @@ func (self *SSkuResourcesMeta) GetDBInstanceSkusByRegionExternalId(regionExterna if len(sku.Zone2) > 0 { zoneId := self.getZoneIdBySuffix(zoneMaps, sku.Zone2) if len(zoneId) == 0 { - return nil, fmt.Errorf("invalid sku %s %s zone2: %s", sku.Id, sku.CloudregionId, sku.Zone2) + log.Errorf("invalid sku %s(%s) %s zone2: %s", sku.Name, sku.Id, sku.CloudregionId, sku.Zone2) + continue } sku.Zone2 = zoneId } @@ -90,7 +92,8 @@ func (self *SSkuResourcesMeta) GetDBInstanceSkusByRegionExternalId(regionExterna if len(sku.Zone3) > 0 { zoneId := self.getZoneIdBySuffix(zoneMaps, sku.Zone3) if len(zoneId) == 0 { - return nil, fmt.Errorf("invalid sku %s %s zone3: %s", sku.Id, sku.CloudregionId, sku.Zone3) + log.Errorf("invalid sku %s(%s) %s zone3: %s", sku.Name, sku.Id, sku.CloudregionId, sku.Zone3) + continue } sku.Zone3 = zoneId }