Skip to content

Commit

Permalink
fix: 避免因io问题导致同步镜像列表为空
Browse files Browse the repository at this point in the history
  • Loading branch information
Qu Xuan committed May 22, 2020
1 parent 5413d3c commit a7e1bdf
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions pkg/multicloud/azure/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/utils"

api "yunion.io/x/onecloud/pkg/apis/compute"
Expand Down Expand Up @@ -342,19 +343,28 @@ func (self *SRegion) GetOfferedImageIDs(publishersFilter []string, offersFilter
offers, err := self.getImageOffers(publisher, toLowerStringArray(offersFilter))
if err != nil {
log.Errorf("failed to found offers for publisher %s error: %v", publisher, err)
if errors.Cause(err) != cloudprovider.ErrNotFound {
return nil, errors.Wrap(err, "getImageOffers")
}
continue
}
for _, offer := range offers {
skus, err := self.getImageSkus(publisher, offer, toLowerStringArray(skusFilter))
if err != nil {
log.Errorf("failed to found skus for publisher %s offer %s error: %v", publisher, offer, err)
if errors.Cause(err) != cloudprovider.ErrNotFound {
return nil, errors.Wrap(err, "getImageSkus")
}
continue
}
for _, sku := range skus {
verFilter = toLowerStringArray(verFilter)
vers, err := self.getImageVersions(publisher, offer, sku, verFilter, latestVer)
if err != nil {
log.Errorf("failed to found publisher %s offer %s sku %s version error: %v", publisher, offer, sku, err)
if errors.Cause(err) != cloudprovider.ErrNotFound {
return nil, errors.Wrap(err, "getImageVersions")
}
continue
}
for _, ver := range vers {
Expand Down

0 comments on commit a7e1bdf

Please sign in to comment.