opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: mount disk readonly (#13152)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2022-04-28 09:26:45 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 8d9a5d67fd
commit 2dd1aeb8aa
20 changed files with 602 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostdeployer/deployserver/deployserver.go
+69 -40
View File
@@ -63,21 +63,27 @@ func (*DeployerServer) DeployGuestFs(ctx context.Context, req *deployapi.DeployP
}
}()
log.Infof("********* Deploy guest fs on %s", req.DiskPath)
var disk = diskutils.GetIDisk(diskutils.DiskParams{
disk, err := diskutils.GetIDisk(diskutils.DiskParams{
Hypervisor: req.GuestDesc.Hypervisor,
DiskPath: req.DiskPath,
VddkInfo: req.VddkInfo,
}, DeployOption.ImageDeployDriver)
}, DeployOption.ImageDeployDriver, false)
if err != nil {
log.Errorf("diskutils.GetIDisk fail %s", err)
return new(deployapi.DeployGuestFsResponse), errors.Wrap(err, "GetIDisk")
}
defer disk.Cleanup()
if len(req.GuestDesc.Hypervisor) == 0 {
req.GuestDesc.Hypervisor = comapi.HYPERVISOR_KVM
}
defer disk.Disconnect()
if err := disk.Connect(); err != nil {
log.Infof("Failed to connect %s disk: %s", req.GuestDesc.Hypervisor, err)
return new(deployapi.DeployGuestFsResponse), nil
return new(deployapi.DeployGuestFsResponse), errors.Wrap(err, "Connect")
}
defer disk.Disconnect()
root, err := disk.MountRootfs()
if err != nil {
log.Infof("Failed mounting rootfs for %s disk", req.GuestDesc.Hypervisor)
return new(deployapi.DeployGuestFsResponse), err
}
defer disk.UmountRootfs(root)
@@ -104,16 +110,19 @@ func (*DeployerServer) ResizeFs(ctx context.Context, req *deployapi.ResizeFsPara
}
}()
log.Infof("********* Resize fs on %s", req.DiskPath)
var disk = diskutils.GetIDisk(diskutils.DiskParams{
disk, err := diskutils.GetIDisk(diskutils.DiskParams{
Hypervisor: req.Hypervisor,
DiskPath: req.DiskPath,
VddkInfo: req.VddkInfo,
}, DeployOption.ImageDeployDriver)
defer disk.Disconnect()
err = disk.Connect()
}, DeployOption.ImageDeployDriver, false)
if err != nil {
return new(deployapi.Empty), errors.Wrap(err, "GetIDisk fail")
}
defer disk.Cleanup()
if err := disk.Connect(); err != nil {
return new(deployapi.Empty), errors.Wrap(err, "disk connect failed")
}
defer disk.Disconnect()
unmount := func(root fsdriver.IRootFsDriver) error {
err := disk.UmountRootfs(root)
@@ -149,16 +158,21 @@ func (*DeployerServer) ResizeFs(ctx context.Context, req *deployapi.ResizeFsPara
func (*DeployerServer) FormatFs(ctx context.Context, req *deployapi.FormatFsParams) (*deployapi.Empty, error) {
log.Infof("********* Format fs on %s", req.DiskPath)
gd := diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver)
defer gd.Disconnect()
gd, err := diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver, false)
if err != nil {
return new(deployapi.Empty), errors.Wrap(err, "NewKVMGuestDisk")
}
defer gd.Cleanup()
if err := gd.Connect(); err == nil {
defer gd.Disconnect()
if err := gd.MakePartition(req.FsFormat); err == nil {
err = gd.FormatPartition(req.FsFormat, req.Uuid)
if err != nil {
return new(deployapi.Empty), err
return new(deployapi.Empty), errors.Wrap(err, "FormatPartition")
}
} else {
return new(deployapi.Empty), err
return new(deployapi.Empty), errors.Wrap(err, "MakePartition")
}
} else {
log.Errorf("failed connect kvm disk %s: %s", req.DiskPath, err)
@@ -169,34 +183,44 @@ func (*DeployerServer) FormatFs(ctx context.Context, req *deployapi.FormatFsPara
func (*DeployerServer) SaveToGlance(ctx context.Context, req *deployapi.SaveToGlanceParams) (*deployapi.SaveToGlanceResponse, error) {
log.Infof("********* %s save to glance", req.DiskPath)
var (
kvmDisk = diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver)
osInfo string
relInfo *deployapi.ReleaseInfo
)
err := func() error {
err := kvmDisk.Connect()
if err != nil {
return errors.Wrapf(err, "kvmDisk.Connect")
}
kvmDisk, err := diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver, false)
if err != nil {
return new(deployapi.SaveToGlanceResponse), errors.Wrap(err, "NewKVMGuestDisk")
}
defer kvmDisk.Cleanup()
err = kvmDisk.Connect()
if err != nil {
log.Errorf("failed connect kvm disk %s: %s", req.DiskPath, err)
} else {
defer kvmDisk.Disconnect()
root, err := kvmDisk.MountKvmRootfs()
if err != nil {
return errors.Wrapf(err, "kvmDisk.MountKvmRootfs")
}
defer kvmDisk.UmountKvmRootfs(root)
err = func() error {
var err error
root, err := kvmDisk.MountKvmRootfs()
if err == nil {
defer kvmDisk.UmountKvmRootfs(root)
osInfo = root.GetOs()
relInfo = root.GetReleaseInfo(root.GetPartition())
if req.Compress {
err = root.PrepareFsForTemplate(root.GetPartition())
}
if req.Compress {
kvmDisk.Zerofree()
}
return err
}()
osInfo = root.GetOs()
relInfo = root.GetReleaseInfo(root.GetPartition())
if req.Compress {
err = root.PrepareFsForTemplate(root.GetPartition())
if err != nil {
log.Errorf("PrepareFsForTemplate %s", err)
}
}
if req.Compress {
kvmDisk.Zerofree()
}
} else {
log.Errorf("")
}
return err
}()
}
return &deployapi.SaveToGlanceResponse{
OsInfo: osInfo,
@@ -230,12 +254,17 @@ func (*DeployerServer) getImageInfo(kvmDisk *diskutils.SKVMGuestDisk) (*deployap
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()
if err := kvmDisk.Connect(); err != nil {
log.Infof("Failed to connect kvm disk %s: %s", req.DiskPath, err)
return new(deployapi.ImageInfo), errors.Error("Disk connector failed to connect image")
kvmDisk, err := diskutils.NewKVMGuestDisk(req.DiskPath, DeployOption.ImageDeployDriver, true)
if err != nil {
return new(deployapi.ImageInfo), errors.Wrap(err, "NewKVMGuestDisk")
}
defer kvmDisk.Cleanup()
if err := kvmDisk.Connect(); err != nil {
log.Errorf("Failed to connect kvm disk %s: %s", req.DiskPath, err)
return new(deployapi.ImageInfo), errors.Wrap(err, "Disk connector failed to connect image")
}
defer kvmDisk.Disconnect()
return s.getImageInfo(kvmDisk)
}
@@ -253,7 +282,7 @@ func (*DeployerServer) ConnectEsxiDisks(
)
ret.Disks = make([]*deployapi.EsxiDiskInfo, len(req.AccessInfo))
for i := 0; i < len(req.AccessInfo); i++ {
disk := diskutils.NewVDDKDisk(req.VddkInfo, req.AccessInfo[i].DiskPath, DeployOption.ImageDeployDriver)
disk, _ := diskutils.NewVDDKDisk(req.VddkInfo, req.AccessInfo[i].DiskPath, DeployOption.ImageDeployDriver, false)
flatFilePath, err = disk.ConnectBlockDevice()
if err != nil {
err = errors.Wrapf(err, "disk %s connect block device", req.AccessInfo[i].DiskPath)
pkg/hostman/hostdeployer/deployserver/options.go
+20 -6
View File
@@ -17,18 +17,24 @@ package deployserver
import (
"os"
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/cloudcommon/consts"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/util/fileutils2"
)
type SDeployOptions struct {
common_options.HostCommonOptions
PrivatePrefixes []string `help:"IPv4 private prefixes"`
ChntpwPath string `help:"path to chntpw tool" default:"/usr/local/bin/chntpw.static"`
EnableRemoteExecutor bool `help:"Enable remote executor" default:"false"`
CloudrootDir string `help:"User cloudroot home dir" default:"/opt"`
ImageDeployDriver string `help:"Image deploy driver" default:"nbd" choices:"nbd|libguestfs"`
CommonConfigFile string `help:"common config file for container"`
PrivatePrefixes []string `help:"IPv4 private prefixes"`
ChntpwPath string `help:"path to chntpw tool" default:"/usr/local/bin/chntpw.static"`
CloudrootDir string `help:"User cloudroot home dir" default:"/opt"`
ImageDeployDriver string `help:"Image deploy driver" default:"nbd" choices:"nbd|libguestfs"`
CommonConfigFile string `help:"common config file for container"`
DeployTempDir string `help:"temp dir for deployer" default:"/opt/cloud/workspace/run/deploy"`
}
var DeployOption SDeployOptions
@@ -44,6 +50,14 @@ func Parse() (hostOpts SDeployOptions) {
// keep base options
hostOpts.BaseOptions.BaseOptions = baseOpt
}
if !fileutils2.Exists(hostOpts.DeployTempDir) {
err := os.MkdirAll(hostOpts.DeployTempDir, 0755)
if err != nil {
log.Fatalf("fail to create %s: %s", hostOpts.DeployTempDir, err)
return
}
}
consts.SetDeployTempDir(hostOpts.DeployTempDir)
return hostOpts
}