fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14748 from wanyaoqi/automated-cherry-pick-of-#14743-upstream-release-3.9

Browse Source 
fix cherry pick of #14743
This commit is contained in:
Zexi Li
2022-08-02 11:58:17 +08:00
committed by GitHub
parent 3cc7a08531 57fe475917
commit 36eacaf6a2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/hostman/guestman/qemu-kvm.go
View File

@@ -322,12 +322,15 @@ func (s *SKVMGuestInstance) DirtyServerRequestStart() {
}
func (s *SKVMGuestInstance) fuseMount(encryptInfo *apis.SEncryptInfo) error {
disks := s.Desc.Disks
disks, _ := s.Desc.GetArray("disks")
for i := 0; i < len(disks); i++ {
if disks[i].MergeSnapshot && len(disks[i].Url) > 0 {
disk, err := storageman.GetManager().GetDiskByPath(disks[i].Path)
mergeSnapshot := jsonutils.QueryBoolean(disks[i], "merge_snapshot", false)
diskUrl, _ := disks[i].GetString("url")
diskPath, _ := disks[i].GetString("path")
if mergeSnapshot && len(diskUrl) > 0 {
disk, err := storageman.GetManager().GetDiskByPath(diskPath)
if err != nil {
return errors.Wrapf(err, "GetDiskByPath(%s)", disks[i].Path)
return errors.Wrapf(err, "GetDiskByPath(%s)", diskPath)
}
storage := disk.GetStorage()
mntPath := path.Join(storage.GetFuseMountPath(), disk.GetId())
@@ -337,7 +340,7 @@ func (s *SKVMGuestInstance) fuseMount(encryptInfo *apis.SEncryptInfo) error {
}
tmpdir := storage.GetFuseTmpPath()
err = fuseutils.MountFusefs(
options.HostOptions.FetcherfsPath, disks[i].Url, tmpdir,
options.HostOptions.FetcherfsPath, diskUrl, tmpdir,
auth.GetTokenString(), mntPath,
options.HostOptions.FetcherfsBlockSize,
encryptInfo,