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

Merge pull request #9476 from wanyaoqi/bugfix/wyq/fix-get-image-image

Browse Source 
fix(host-deployer): probe image info umount rootfs first
This commit is contained in:
Zexi Li
2020-12-18 00:17:34 +08:00
committed by GitHub
parent c6df981054 37b036ed37
commit 76f571d538
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostdeployer/deployserver/deployserver.go
+23 -20
View File
@@ -184,20 +184,31 @@ func (*DeployerServer) SaveToGlance(ctx context.Context, req *deployapi.SaveToGl
}, nil
}
func getImageInfo(kvmDisk *diskutils.SKVMGuestDisk, rootfs fsdriver.IRootFsDriver) *deployapi.ImageInfo {
partition := rootfs.GetPartition()
return &deployapi.ImageInfo{
OsInfo: rootfs.GetReleaseInfo(partition),
OsType: rootfs.GetOs(),
IsUefiSupport: kvmDisk.DetectIsUEFISupport(rootfs),
IsLvmPartition: kvmDisk.IsLVMPartition(),
IsReadonly: partition.IsReadonly(),
PhysicalPartitionType: partition.GetPhysicalPartitionType(),
IsInstalledCloudInit: rootfs.IsCloudinitInstall(),
func (*DeployerServer) getImageInfo(kvmDisk *diskutils.SKVMGuestDisk) (*deployapi.ImageInfo, error) {
// Fsck is executed during mount
rootfs := kvmDisk.MountKvmRootfs()
if rootfs == nil {
return new(deployapi.ImageInfo), fmt.Errorf("Failed mounting rootfs for kvm disk")
}
partition := rootfs.GetPartition()
imageInfo := &deployapi.ImageInfo{
OsInfo: rootfs.GetReleaseInfo(partition),
OsType: rootfs.GetOs(),
IsLvmPartition: kvmDisk.IsLVMPartition(),
IsReadonly: partition.IsReadonly(),
IsInstalledCloudInit: rootfs.IsCloudinitInstall(),
}
kvmDisk.UmountKvmRootfs(rootfs)
// In case of deploy driver is guestfish, we can't mount
// multi partition concurrent, so we need umount rootfs first
imageInfo.IsUefiSupport = kvmDisk.DetectIsUEFISupport(rootfs)
imageInfo.PhysicalPartitionType = partition.GetPhysicalPartitionType()
log.Infof("ProbeImageInfo response %s", imageInfo)
return imageInfo, nil
}
func (*DeployerServer) ProbeImageInfo(ctx context.Context, req *deployapi.ProbeImageInfoPramas) (*deployapi.ImageInfo, error) {
func (s *DeployerServer) ProbeImageInfo(ctx context.Context, req *deployapi.ProbeImageInfoPramas) (*deployapi.ImageInfo, error) {
log.Infof("********* %s probe image info", req.DiskPath)
kvmDisk := diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver)
defer kvmDisk.Disconnect()
@@ -206,15 +217,7 @@ func (*DeployerServer) ProbeImageInfo(ctx context.Context, req *deployapi.ProbeI
return new(deployapi.ImageInfo), errors.Error("Disk connector failed to connect image")
}
// Fsck is executed during mount
rootfs := kvmDisk.MountKvmRootfs()
if rootfs == nil {
return new(deployapi.ImageInfo), fmt.Errorf("Failed mounting rootfs for kvm disk")
}
defer kvmDisk.UmountKvmRootfs(rootfs)
imageInfo := getImageInfo(kvmDisk, rootfs)
log.Infof("ProbeImageInfo response %s", imageInfo)
return imageInfo, nil
return s.getImageInfo(kvmDisk)
}
var connectedEsxiDisks = map[string]*diskutils.VDDKDisk{}