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

fix(host): guest desc correct rbd disk path (#25394)

Browse Source
This commit is contained in:
wanyaoqi
2026-08-24 14:36:57 +08:00
committed by GitHub
parent dff7fdf3ed
commit d39bf74851
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/hostman/storageman/diskhandlers/diskhandler.go
View File

@@ -32,6 +32,7 @@ import (
deployapi "yunion.io/x/onecloud/pkg/hostman/hostdeployer/apis"
"yunion.io/x/onecloud/pkg/hostman/hostutils"
"yunion.io/x/onecloud/pkg/hostman/storageman"
"yunion.io/x/onecloud/pkg/hostman/storageman/lvmutils"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
@@ -349,6 +350,36 @@ func diskResize(ctx context.Context, userCred mcclient.TokenCredential, storage
if !ok {
return nil, hostutils.ParamsError
}
if input.GuestDesc != nil {
disks := input.GuestDesc.Disks
var diskPaths = make([]string, len(disks))
for i := range disks {
diskPath := disks[i].Path
diskPaths[i] = diskPath
// GetDiskByPath will probe disks
disk, err := storageman.GetManager().GetDiskByPath(diskPath)
if err != nil {
return nil, errors.Wrapf(err, "GetDiskByPath(%s)", diskPath)
}
disks[i].Path = disk.GetPath()
}
defer func() {
for i := range diskPaths {
diskPath := diskPaths[i]
disks[i].Path = diskPath
disk, e := storageman.GetManager().GetDiskByPath(diskPath)
if e != nil {
log.Errorf("failed get disk bypath %s %s", diskPath, e)
}
if utils.IsInStringArray(disk.GetType(), []string{compute.STORAGE_SLVM, compute.STORAGE_CLVM}) {
if errDeactive := lvmutils.LVDeactivate(diskPath); err != nil {
log.Errorf("failed deactive disk %s: %s", diskPath, errDeactive)
}
}
}
}()
}
return disk.Resize(ctx, input)
}
hostutils.DelayTask(ctx, resizeFunc, resizeDiskInfo)