fix(host-deployer): qemu deployer without kvm support (#18875)

yunionio · Dec 4, 2023 · 0692c20 · 0692c20
1 parent 1977a72
commit 0692c20
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/pkg/hostman/diskutils/qemu_kvm/driver.go b/pkg/hostman/diskutils/qemu_kvm/driver.go
@@ -467,9 +467,10 @@ func (d *QemuX86Driver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool,
 	cmd := QEMU_KVM_PATH
 	if sysutils.IsKvmSupport() {
 		cmd += __("-enable-kvm")
+		cmd += __("-cpu host")
+	} else {
+		cmd += __("-cpu max")
 	}
-
-	cmd += __("-cpu host")
 	cmd += __("-M pc")
 
 	d.pidPath = fmt.Sprintf("/tmp/%s.pid", uuid)
@@ -560,9 +561,10 @@ func (d *QemuARMDriver) StartGuest(sshPort, ncpu, memSizeMB int, hugePage bool,
 	cmd := QEMU_KVM_PATH
 	if sysutils.IsKvmSupport() {
 		cmd += __("-enable-kvm")
+		cmd += __("-cpu host")
+	} else {
+		cmd += __("-cpu max")
 	}
-
-	cmd += __("-cpu host")
 	cmd += __("-M virt")
 
 	d.pidPath = fmt.Sprintf("/tmp/%s.pid", uuid)

diff --git a/pkg/hostman/guestfs/kvmpart/kvmpart.go b/pkg/hostman/guestfs/kvmpart/kvmpart.go
@@ -303,18 +303,6 @@ func (p *SKVMGuestDiskPartition) Umount() error {
 		}
 	}
 
-	// check lsof
-	for {
-		out, err := procutils.NewCommand("lsof", p.mountPath).Output()
-		if err != nil {
-			log.Warningf("lsof %s fail %s", p.mountPath, err)
-			break
-		} else {
-			log.Infof("unmount path %s lsof %s", p.mountPath, string(out))
-			time.Sleep(time.Second * 1)
-		}
-	}
-
 	var tries = 0
 	var err error
 	var out []byte
@@ -332,6 +320,9 @@ func (p *SKVMGuestDiskPartition) Umount() error {
 			log.Infof("umount %s successfully", p.partDev)
 			return nil
 		} else {
+			lsofout, err := procutils.NewCommand("lsof", p.mountPath).Output()
+			log.Infof("unmount path %s lsof %s", p.mountPath, string(lsofout))
+
 			log.Warningf("failed umount %s: %s %s", p.partDev, err, out)
 			time.Sleep(time.Second * 3)
 		}

diff --git a/pkg/hostman/hostdeployer/deployserver/deployserver.go b/pkg/hostman/hostdeployer/deployserver/deployserver.go
@@ -94,11 +94,11 @@ func (*DeployerServer) DeployGuestFs(ctx context.Context, req *deployapi.DeployP
 	}
 	defer disk.Cleanup()
 
+	defer disk.Disconnect()
 	if err := disk.Connect(req.GuestDesc); err != nil {
 		log.Errorf("Failed to connect %s disk: %s", req.GuestDesc.Hypervisor, err)
 		return new(deployapi.DeployGuestFsResponse), errors.Wrap(err, "Connect")
 	}
-	defer disk.Disconnect()
 
 	ret, err := disk.DeployGuestfs(req)
 	if ret == nil {
@@ -132,10 +132,11 @@ func (*DeployerServer) ResizeFs(ctx context.Context, req *deployapi.ResizeFsPara
 		return new(deployapi.Empty), errors.Wrap(err, "GetIDisk fail")
 	}
 	defer disk.Cleanup()
+
+	defer disk.Disconnect()
 	if err := disk.Connect(nil); err != nil {
 		return new(deployapi.Empty), errors.Wrap(err, "disk connect failed")
 	}
-	defer disk.Disconnect()
 
 	return disk.ResizeFs()
 }