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(host,host-deployer): start deployer guest with all of disk (#21710)

Browse Source
This commit is contained in:
wanyaoqi
2024-12-02 14:58:52 +08:00
committed by GitHub
parent d463a945f7
commit 2857dcaef2
2 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/diskutils/qemu_kvm/driver.go
+22 -13
View File
@@ -301,15 +301,19 @@ func (d *QemuKvmDriver) connect(guestDesc *apis.GuestDesc) error {
var sshport = manager.GetSshFreePort()
defer manager.unsetPort(sshport)
//if guestDesc != nil {
// for i := range guestDesc.Disks {
// disks = append(disks, guestDesc.Disks[i].Path)
// }
//} else {
disks = append(disks, d.imageInfo.Path)
//}
if guestDesc != nil && len(guestDesc.Disks) > 0 {
for i := range guestDesc.Disks {
disks = append(disks, guestDesc.Disks[i].Path)
}
} else {
disks = append(disks, d.imageInfo.Path)
}
err := d.qemuArchDriver.StartGuest(sshport, ncpu, memSizeMB, manager.hugepage, manager.hugepageSizeKB, d.imageInfo)
err := d.qemuArchDriver.StartGuest(
sshport, ncpu, memSizeMB,
manager.hugepage, manager.hugepageSizeKB,
d.imageInfo, disks,
)
if err != nil {
return err
}
@@ -609,7 +613,7 @@ func (d *QemuBaseDriver) CleanGuest() {
}
func (d *QemuBaseDriver) startCmds(
sshPort, ncpu, memSizeMB int, imageInfo qemuimg.SImageInfo,
sshPort, ncpu, memSizeMB int, imageInfo qemuimg.SImageInfo, disksPath []string,
machineOpts, cdromDeviceOpts, fwOpts, socketPath, initrdPath, kernelPath string,
) string {
cmd := manager.qemuCmd
@@ -644,7 +648,10 @@ func (d *QemuBaseDriver) startCmds(
cmd += __("-object %s", imageInfo.SecretOptions())
}
for i, diskPath := range []string{imageInfo.Path} {
if len(disksPath) == 0 {
disksPath = []string{imageInfo.Path}
}
for i, diskPath := range disksPath {
diskDrive := __("-drive file=%s,if=none,id=drive_%d,cache=none", diskPath, i)
if imageInfo.Format != qemuimgfmt.RAW && imageInfo.Encrypted() {
diskDrive += ",encrypt.format=luks,encrypt.key-secret=sec0"
@@ -663,7 +670,7 @@ type QemuX86Driver struct {
QemuBaseDriver
}
func (d *QemuX86Driver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo) error {
func (d *QemuX86Driver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo, disksPath []string) error {
uuid := stringutils.UUID4()
socketPath := fmt.Sprintf("/opt/cloud/host-deployer/hmp_%s.socket", uuid)
d.pidPath = fmt.Sprintf("/opt/cloud/host-deployer/%s.pid", uuid)
@@ -675,6 +682,7 @@ func (d *QemuX86Driver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool,
ncpu,
memSizeMB,
imageInfo,
disksPath,
machineOpts,
cdromDeviceOpts,
"",
@@ -717,7 +725,7 @@ type QemuARMDriver struct {
QemuBaseDriver
}
func (d *QemuARMDriver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo) error {
func (d *QemuARMDriver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo, disksPath []string) error {
uuid := stringutils.UUID4()
socketPath := fmt.Sprintf("/opt/cloud/host-deployer/hmp_%s.socket", uuid)
d.pidPath = fmt.Sprintf("/opt/cloud/host-deployer/%s.pid", uuid)
@@ -736,6 +744,7 @@ func (d *QemuARMDriver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool,
ncpu,
memSizeMB,
imageInfo,
disksPath,
machineOpts,
cdromDeviceOpts,
fwOpts,
@@ -775,7 +784,7 @@ func (d *QemuARMDriver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool,
}
type IQemuArchDriver interface {
StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo) error
StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool, pageSizeKB int, imageInfo qemuimg.SImageInfo, disksPath []string) error
CleanGuest()
}
pkg/hostman/guestman/qemu-kvm.go
+23 -7
View File
@@ -2092,6 +2092,9 @@ func (s *SKVMGuestInstance) StartGuest(ctx context.Context, userCred mcclient.To
}
func (s *SKVMGuestInstance) DeployFs(ctx context.Context, userCred mcclient.TokenCredential, deployInfo *deployapi.DeployInfo) (jsonutils.JSONObject, error) {
if len(s.Desc.Disks) == 0 {
return nil, fmt.Errorf("Guest dosen't have disk ??")
}
diskInfo := deployapi.DiskInfo{}
if s.isEncrypted() {
ekey, err := s.getEncryptKey(ctx, userCred)
@@ -2102,24 +2105,37 @@ func (s *SKVMGuestInstance) DeployFs(ctx context.Context, userCred mcclient.Toke
diskInfo.EncryptPassword = ekey.Key
diskInfo.EncryptAlg = string(ekey.Alg)
}
var sysDisk storageman.IDisk
disks := s.Desc.Disks
if len(disks) > 0 {
diskPath := disks[0].Path
for i := range disks {
diskPath := disks[i].Path
// GetDiskByPath will probe disks
disk, err := storageman.GetManager().GetDiskByPath(diskPath)
if err != nil {
return nil, errors.Wrapf(err, "GetDiskByPath(%s)", diskPath)
}
diskInfo.Path = disk.GetPath()
ret, err := disk.DeployGuestFs(&diskInfo, s.Desc, deployInfo)
if i == 0 {
// sys disk
diskInfo.Path = disk.GetPath()
sysDisk = disk
}
}
ret, err := sysDisk.DeployGuestFs(&diskInfo, s.Desc, deployInfo)
for i := range disks {
diskPath := disks[i].Path
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{api.STORAGE_SLVM, api.STORAGE_CLVM}) {
if errDeactive := lvmutils.LVDeactivate(diskPath); err != nil {
log.Errorf("failed deactive disk %s: %s", diskPath, errDeactive)
}
}
return ret, err
} else {
return nil, fmt.Errorf("Guest dosen't have disk ??")
}
return ret, err
}
// Delay process