fix(worker): use no timeout client on cdn upload (#5794)

ovh · Apr 15, 2021 · b7adeeb · b7adeeb
1 parent 7cb4839
commit b7adeeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sdk/cdsclient/client_cdn.go b/sdk/cdsclient/client_cdn.go
@@ -42,12 +42,12 @@ func (c *client) CDNItemUpload(ctx context.Context, cdnAddr string, signature st
 		if err != nil {
 			return time.Since(t0), err
 		}
-		_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
-		if err != nil {
+		if _, _, _, err := c.Stream(ctx, c.HTTPNoTimeoutClient(), http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature)); err != nil {
 			savedError = newAPIError(fmt.Errorf("unable to upload file, try %d: %v", i+1, err))
 			time.Sleep(1 * time.Second)
 			continue
 		}
+		//_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
 		savedError = nil
 		break
 	}

diff --git a/sdk/cdsclient/http.go b/sdk/cdsclient/http.go
@@ -230,7 +230,7 @@ func (c *client) Stream(ctx context.Context, httpClient HTTPClient, method strin
 		var requestError error
 		if rs, ok := body.(io.ReadSeeker); ok {
 			if _, err := rs.Seek(0, 0); err != nil {
-				return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v", i, err))
+				return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v. Original error: %v", i, err, savederror))
 			}
 			req, requestError = http.NewRequest(method, url, body)
 		} else {