opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remote file not move

Browse Source
This commit is contained in:
Qiu Jian
2022-03-30 07:32:54 +08:00
parent c761768f36
commit c0dfabbafa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/remotefile/remotefile.go
+7 -5
View File
@@ -25,6 +25,7 @@ import (
"syscall"
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
@@ -150,11 +151,11 @@ func (r *SRemoteFile) fetch(preChksum string, callback func(progress, progressMb
log.Errorf("remote checksume %s != local checksum %s", r.chksum, localChksum)
return fmt.Errorf("remote checksum %s != local checksum %s", r.chksum, localChksum)
}
log.Debugf("localPath %s tmpPath %s", r.localPath, r.tmpPath)
if r.localPath != r.tmpPath {
syscall.Unlink(r.localPath)
return syscall.Rename(r.tmpPath, r.localPath)
}
}
log.Debugf("localPath %s tmpPath %s", r.localPath, r.tmpPath)
if r.localPath != r.tmpPath {
syscall.Unlink(r.localPath)
return syscall.Rename(r.tmpPath, r.localPath)
}
return nil
}
@@ -274,6 +275,7 @@ func (r *SRemoteFile) downloadInternal(getData bool, preChksum string, callback
}
func (r *SRemoteFile) setProperties(header http.Header) {
log.Debugf("remoteFile headers: %s", jsonutils.Marshal(header))
if chksum := header.Get("X-Image-Meta-Checksum"); len(chksum) > 0 {
r.chksum = chksum
}