From 37b87d1a500e2eb877f1a875fd732275f5d29a55 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 22 Sep 2020 10:41:32 +0800 Subject: [PATCH] fix: avoid not reture cloudprovider.ErrNotFound error --- pkg/multicloud/google/google.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/multicloud/google/google.go b/pkg/multicloud/google/google.go index 2ab0816ab2..027ad0f162 100644 --- a/pkg/multicloud/google/google.go +++ b/pkg/multicloud/google/google.go @@ -814,9 +814,11 @@ func (g *gError) ParseErrorFromJsonResponse(statusCode int, body jsonutils.JSONO func _jsonRequest(cli *http.Client, method httputils.THttpMethod, url string, body jsonutils.JSONObject, debug bool) (jsonutils.JSONObject, error) { client := httputils.NewJsonClient(cli) req := httputils.NewJsonRequest(method, url, body) - var ge gError + var err error + var data jsonutils.JSONObject for i := 0; i < MAX_RETRY; i++ { - _, data, err := client.Send(context.Background(), req, &ge, debug) + var ge gError + _, data, err = client.Send(context.Background(), req, &ge, debug) if err == nil { return data, nil } @@ -835,9 +837,9 @@ func _jsonRequest(cli *http.Client, method httputils.THttpMethod, url string, bo continue } } - return nil, &ge + return nil, err } - return nil, &ge + return nil, err } func (self *SGoogleClient) GetRegion(regionId string) *SRegion {