opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6599 from wanyaoqi/automated-cherry-pick-of-#6598-upstream-release-3.2

Browse Source 
Automated cherry pick of #6598: fix remotefile fetch image propertites
This commit is contained in:
Zexi Li
2020-05-26 17:15:20 +08:00
committed by GitHub
parent 13b43caf91 fd4830859e
commit 7b5053e77f
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/remotefile/remotefile.go
+29 -15
View File
@@ -163,24 +163,28 @@ func (r *SRemoteFile) fetch(preChksum string) bool {
// retry download
func (r *SRemoteFile) download(getData bool, preChksum string) bool {
result := r.downloadInternal(getData, preChksum)
if !result && len(r.downloadUrl) > 0 {
if getData {
// fetch image headers and set resource properties
if !r.downloadInternal(false, preChksum) {
log.Errorf("fetch image properties failed")
}
}
if r.downloadInternal(getData, preChksum) {
return true
} else {
log.Errorf("download from cached url %s failed, try direct download from %s ...", r.downloadUrl, r.url)
r.downloadUrl = ""
result = r.downloadInternal(getData, preChksum)
if getData {
// fetch image headers and set resource properties
if !r.downloadInternal(false, preChksum) {
log.Errorf("fetch image properties failed")
}
}
return r.downloadInternal(getData, preChksum)
}
return result
}
func (r *SRemoteFile) downloadInternal(getData bool, preChksum string) bool {
os.Remove(r.tmpPath)
fi, err := os.Create(r.tmpPath)
if err != nil {
log.Errorln(err)
return false
}
defer fi.Close()
var header = http.Header{}
header.Set("X-Auth-Token", auth.GetTokenString())
if len(preChksum) > 0 {
@@ -212,6 +216,14 @@ func (r *SRemoteFile) downloadInternal(getData bool, preChksum string) bool {
defer resp.Body.Close()
if resp.StatusCode < 300 {
if getData {
os.Remove(r.tmpPath)
fi, err := os.Create(r.tmpPath)
if err != nil {
log.Errorln(err)
return false
}
defer fi.Close()
var reader = resp.Body
if r.compress {
@@ -224,7 +236,7 @@ func (r *SRemoteFile) downloadInternal(getData bool, preChksum string) bool {
reader = zlibRC
}
_, err := io.Copy(fi, reader)
_, err = io.Copy(fi, reader)
if err != nil {
log.Errorln(err)
return false
@@ -233,8 +245,10 @@ func (r *SRemoteFile) downloadInternal(getData bool, preChksum string) bool {
r.setProperties(resp.Header)
return true
} else if resp.StatusCode == 304 {
if err := os.Remove(r.tmpPath); err != nil {
log.Errorf("Fail to remove file %s", r.tmpPath)
if fileutils2.Exists(r.tmpPath) {
if err := os.Remove(r.tmpPath); err != nil {
log.Errorf("Fail to remove file %s", r.tmpPath)
}
}
return true
} else {