Merge pull request #6727 from unclejack/improve_bytes_range
Improve layer downloading
This commit is contained in:
commit
2ff0ef4407
1 changed files with 23 additions and 33 deletions
|
@ -391,51 +391,41 @@ func (r *Registry) GetRemoteImageJSON(imgID, registry string, token []string) ([
|
||||||
func (r *Registry) GetRemoteImageLayer(imgID, registry string, token []string, imgSize int64) (io.ReadCloser, error) {
|
func (r *Registry) GetRemoteImageLayer(imgID, registry string, token []string, imgSize int64) (io.ReadCloser, error) {
|
||||||
var (
|
var (
|
||||||
retries = 5
|
retries = 5
|
||||||
headRes *http.Response
|
|
||||||
client *http.Client
|
client *http.Client
|
||||||
hasResume bool = false
|
res *http.Response
|
||||||
imageURL = fmt.Sprintf("%simages/%s/layer", registry, imgID)
|
imageURL = fmt.Sprintf("%simages/%s/layer", registry, imgID)
|
||||||
)
|
)
|
||||||
headReq, err := r.reqFactory.NewRequest("HEAD", imageURL, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("Error while getting from the server: %s\n", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
setTokenAuth(headReq, token)
|
|
||||||
for i := 1; i <= retries; i++ {
|
|
||||||
headRes, client, err = r.doRequest(headReq)
|
|
||||||
if err != nil && i == retries {
|
|
||||||
return nil, fmt.Errorf("Eror while making head request: %s\n", err)
|
|
||||||
} else if err != nil {
|
|
||||||
time.Sleep(time.Duration(i) * 5 * time.Second)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
if headRes.Header.Get("Accept-Ranges") == "bytes" && imgSize > 0 {
|
|
||||||
hasResume = true
|
|
||||||
}
|
|
||||||
|
|
||||||
req, err := r.reqFactory.NewRequest("GET", imageURL, nil)
|
req, err := r.reqFactory.NewRequest("GET", imageURL, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("Error while getting from the server: %s\n", err)
|
return nil, fmt.Errorf("Error while getting from the server: %s\n", err)
|
||||||
}
|
}
|
||||||
setTokenAuth(req, token)
|
setTokenAuth(req, token)
|
||||||
if hasResume {
|
for i := 1; i <= retries; i++ {
|
||||||
utils.Debugf("server supports resume")
|
res, client, err = r.doRequest(req)
|
||||||
return utils.ResumableRequestReader(client, req, 5, imgSize), nil
|
|
||||||
}
|
|
||||||
utils.Debugf("server doesn't support resume")
|
|
||||||
res, _, err := r.doRequest(req)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
res.Body.Close()
|
||||||
|
if i == retries {
|
||||||
|
return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
|
||||||
|
res.StatusCode, imgID)
|
||||||
}
|
}
|
||||||
|
time.Sleep(time.Duration(i) * 5 * time.Second)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
if res.StatusCode != 200 {
|
if res.StatusCode != 200 {
|
||||||
res.Body.Close()
|
res.Body.Close()
|
||||||
return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
|
return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
|
||||||
res.StatusCode, imgID)
|
res.StatusCode, imgID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if res.Header.Get("Accept-Ranges") == "bytes" && imgSize > 0 {
|
||||||
|
utils.Debugf("server supports resume")
|
||||||
|
return utils.ResumableRequestReaderWithInitialResponse(client, req, 5, imgSize, res), nil
|
||||||
|
}
|
||||||
|
utils.Debugf("server doesn't support resume")
|
||||||
return res.Body, nil
|
return res.Body, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue