Skip to content

Commit b7adeeb

Browse files
authored
fix(worker): use no timeout client on cdn upload (#5794)
1 parent 7cb4839 commit b7adeeb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

sdk/cdsclient/client_cdn.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ func (c *client) CDNItemUpload(ctx context.Context, cdnAddr string, signature st
4242
if err != nil {
4343
return time.Since(t0), err
4444
}
45-
_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
46-
if err != nil {
45+
if _, _, _, err := c.Stream(ctx, c.HTTPNoTimeoutClient(), http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature)); err != nil {
4746
savedError = newAPIError(fmt.Errorf("unable to upload file, try %d: %v", i+1, err))
4847
time.Sleep(1 * time.Second)
4948
continue
5049
}
50+
//_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
5151
savedError = nil
5252
break
5353
}

sdk/cdsclient/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (c *client) Stream(ctx context.Context, httpClient HTTPClient, method strin
230230
var requestError error
231231
if rs, ok := body.(io.ReadSeeker); ok {
232232
if _, err := rs.Seek(0, 0); err != nil {
233-
return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v", i, err))
233+
return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v. Original error: %v", i, err, savederror))
234234
}
235235
req, requestError = http.NewRequest(method, url, body)
236236
} else {

0 commit comments

Comments
 (0)