fix(host): slvm create from snapshot (#25265)

wanyaoqi · web-flow · commit 61963c572115 · 2026-08-04T10:22:54.000+08:00
diff --git a/pkg/apis/compute/guest_disk.go b/pkg/apis/compute/guest_disk.go
@@ -90,6 +90,7 @@ type GuestdiskJsonDesc struct {
 	Index             int8   `json:"index"`
 	BootIndex         *int8  `json:"boot_index"`
 	MergeSnapshot     bool   `json:"merge_snapshot"`
+	SnapshotId        string `json:"snapshot_id"`
 	Fs                string `json:"fs"`
 	Mountpoint        string `json:"mountpoint"`
 	Dev               string `json:"dev"`
diff --git a/pkg/compute/models/guestdisks.go b/pkg/compute/models/guestdisks.go
@@ -237,6 +237,7 @@ func (self *SGuestdisk) GetDiskJsonDescAtHost(ctx context.Context, host *SHost,
 				desc.Url = url
 			}
 		}
+		desc.SnapshotId = disk.SnapshotId
 	}
 	if fpath := disk.GetMetadata(ctx, api.DISK_META_REMOTE_ACCESS_PATH, nil); len(fpath) > 0 {
 		guest := self.getGuest()
diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go
@@ -1214,6 +1214,7 @@ func (s *SKVMGuestInstance) eventBlockJobReady(event *monitor.Event) {
 		return
 	}
 	var diskId, diskPath, diskUrl string
+	var mergeSnapshotId string
 	var mergeSnapshots bool
 	for i := 0; i < len(disks); i++ {
 		index := disks[i].Index
@@ -1222,6 +1223,7 @@ func (s *SKVMGuestInstance) eventBlockJobReady(event *monitor.Event) {
 			diskPath = disks[i].Path
 			diskUrl = disks[i].Url
 			mergeSnapshots = disks[i].MergeSnapshot
+			mergeSnapshotId = disks[i].SnapshotId
 		}
 	}
 	if len(diskId) == 0 {
@@ -1235,7 +1237,7 @@ func (s *SKVMGuestInstance) eventBlockJobReady(event *monitor.Event) {
 		return
 	}
 	if mergeSnapshots {
-		disk.PostCreateFromRemoteHostImage(diskUrl)
+		disk.PostCreateFromRemoteHostImage(diskUrl, mergeSnapshotId)
 	}
 	blockJobCount := s.BlockJobsCount()
 	if blockJobCount == 0 {
@@ -2165,7 +2167,7 @@ func (s *SKVMGuestInstance) delTmpDisks(ctx context.Context, migrated bool) erro
 				}
 			}
 			if d != nil && disk.MergeSnapshot {
-				d.PostCreateFromRemoteHostImage(disk.Url)
+				d.PostCreateFromRemoteHostImage(disk.Url, disk.SnapshotId)
 			}
 			if migrated {
 				if d != nil && utils.IsInStringArray(d.GetType(), []string{api.STORAGE_SLVM, api.STORAGE_CLVM}) {
@@ -2931,7 +2933,7 @@ func (s *SKVMGuestInstance) streamDisksComplete(ctx context.Context) {
 		if disks[i].MergeSnapshot {
 			if d != nil {
 				log.Infof("Disk %s do post create from fuse", d.GetId())
-				d.PostCreateFromRemoteHostImage(disks[i].Url)
+				d.PostCreateFromRemoteHostImage(disks[i].Url, disks[i].SnapshotId)
 			}
 
 			disks[i].MergeSnapshot = false
diff --git a/pkg/hostman/storageman/disk_base.go b/pkg/hostman/storageman/disk_base.go
@@ -72,7 +72,7 @@ type IDisk interface {
 	CreateFromRbdSnapshot(ctx context.Context, snapshotId, srcDiskId, srcPool string) error
 	CreateFromRemoteHostImage(ctx context.Context, url string, size int64, encryptInfo *apis.SEncryptInfo) error
 	CreateRaw(ctx context.Context, sizeMb int, diskFormat string, fsFormat string, fsFeatures *api.DiskFsFeatures, encryptInfo *apis.SEncryptInfo, diskId string, back string) (jsonutils.JSONObject, error)
-	PostCreateFromRemoteHostImage(diskUrl string)
+	PostCreateFromRemoteHostImage(diskUrl string, snapshotId string)
 	CreateSnapshot(snapshotId string, encryptKey string, encFormat qemuimg.TEncryptFormat, encAlg seclib2.TSymEncAlg) error
 	DeleteSnapshot(snapshotId, convertSnapshot string, blockStream bool, encryptInfo apis.SEncryptInfo) error
 	DeployGuestFs(diskInfo *deployapi.DiskInfo, guestDesc *desc.SGuestDesc,
@@ -179,7 +179,7 @@ func (d *SBaseDisk) RebuildSlaveDisk(diskUri string) error {
 	return nil
 }
 
-func (d *SBaseDisk) PostCreateFromRemoteHostImage(string) {
+func (d *SBaseDisk) PostCreateFromRemoteHostImage(string, string) {
 }
 
 func (d *SBaseDisk) GetZoneId() string {
diff --git a/pkg/hostman/storageman/disk_local.go b/pkg/hostman/storageman/disk_local.go
@@ -458,7 +458,7 @@ func (d *SLocalDisk) GetDiskSetupScripts(diskIndex int) string {
 	return cmd
 }
 
-func (d *SLocalDisk) PostCreateFromRemoteHostImage(diskUrl string) {
+func (d *SLocalDisk) PostCreateFromRemoteHostImage(diskUrl string, snapshotId string) {
 	if diskUrl != "" {
 		if err := d.RequestCloseNbdImage(context.Background(), diskUrl); err != nil {
 			log.Errorf("failed request close nbd image %s: %s", diskUrl, err)
diff --git a/pkg/hostman/storageman/disk_lvm.go b/pkg/hostman/storageman/disk_lvm.go
@@ -176,7 +176,7 @@ func (d *SLVMDisk) Delete(ctx context.Context, params interface{}) (jsonutils.JS
 	return nil, nil
 }
 
-func (d *SLVMDisk) PostCreateFromRemoteHostImage(diskUrl string) {
+func (d *SLVMDisk) PostCreateFromRemoteHostImage(diskUrl string, snapshotId string) {
 	if diskUrl != "" {
 		if err := d.RequestCloseNbdImage(context.Background(), diskUrl); err != nil {
 			log.Errorf("failed request close nbd image %s: %s", diskUrl, err)
diff --git a/pkg/hostman/storageman/disk_rbd.go b/pkg/hostman/storageman/disk_rbd.go
@@ -237,7 +237,7 @@ func (d *SRBDDisk) CreateRaw(ctx context.Context, sizeMb int, diskFormat string,
 	return d.GetDiskDesc(), nil
 }
 
-func (d *SRBDDisk) PostCreateFromRemoteHostImage(string) {
+func (d *SRBDDisk) PostCreateFromRemoteHostImage(string, string) {
 	log.Errorf("Not support PostCreateFromRemoteHostImage")
 }
 
diff --git a/pkg/hostman/storageman/disk_slvm.go b/pkg/hostman/storageman/disk_slvm.go
@@ -225,10 +225,6 @@ func (d *SSLVMDisk) CreateSnapshot(snapshotId string, encryptKey string, encForm
 	return nil
 }
 
-func (d *SSLVMDisk) PostCreateFromRemoteHostImage(string) {
-	log.Infof("slvm post create from fuse do nothing")
-}
-
 func (d *SSLVMDisk) ResetFromSnapshot(ctx context.Context, params interface{}) (jsonutils.JSONObject, error) {
 	err := lvmutils.LVActive(d.GetPath(), false, d.Storage.Lvmlockd())
 	if err != nil {
@@ -304,6 +300,43 @@ func (d *SSLVMDisk) CreateFromSnapshotLocation(ctx context.Context, snapshotLoca
 	return ret, nil
 }
 
+func (d *SSLVMDisk) PostCreateFromRemoteHostImage(diskUrl string, snapshotId string) {
+	if len(snapshotId) == 0 {
+		return
+	}
+	snapshotPath := d.GetSnapshotPath(snapshotId)
+
+	curPath := snapshotPath
+	for {
+		if !fileutils2.Exists(curPath) {
+			break
+		}
+		if inUse, err := lvmutils.IsDeviceInUse(curPath); inUse {
+			log.Errorf("slvm PostCreateFromRemoteHostImage %s inuse", curPath)
+			break
+		} else if err != nil {
+			log.Errorf("slvm PostCreateFromRemoteHostImage failed check device %s is inuse: %s", curPath, err)
+			break
+		}
+
+		img, err := qemuimg.NewQemuImage(curPath)
+		if err != nil {
+			log.Errorf("failed open qemu image %s: %s", curPath, err)
+			break
+		}
+		backPath := img.BackFilePath
+		if err := lvmutils.LVDeactivate(curPath); err != nil {
+			log.Errorf("failed deactivate lv %s: %s", curPath, err)
+			break
+		}
+		if len(backPath) == 0 || strings.HasPrefix(path.Base(backPath), IMAGECACHE_PREFIX) {
+			break
+		} else {
+			curPath = backPath
+		}
+	}
+}
+
 func (d *SSLVMDisk) DeleteSnapshot(snapshotId, convertSnapshot string, blockStream bool, encryptInfo apis.SEncryptInfo) error {
 	err := lvmutils.LVActive(d.GetPath(), false, d.Storage.Lvmlockd())
 	if err != nil {
diff --git a/pkg/hostman/storageman/lvmutils/lvmutils.go b/pkg/hostman/storageman/lvmutils/lvmutils.go
@@ -17,8 +17,12 @@ package lvmutils
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
@@ -328,3 +332,53 @@ func GetLvSize(lvPath string) (int64, error) {
 	}
 	return size, nil
 }
+
+func IsDeviceInUse(devPath string) (bool, error) {
+	fi, err := os.Stat(devPath)
+	if err != nil {
+		return false, fmt.Errorf("stat %s: %w", devPath, err)
+	}
+	stat, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return false, fmt.Errorf("cannot get raw stat")
+	}
+	targetDev := uint64(stat.Rdev)
+
+	procEntries, err := ioutil.ReadDir("/proc")
+	if err != nil {
+		return false, fmt.Errorf("read /proc: %w", err)
+	}
+
+	for _, entry := range procEntries {
+		if !entry.IsDir() {
+			continue
+		}
+		_, err := strconv.Atoi(entry.Name())
+		if err != nil {
+			continue
+		}
+
+		fdDir := filepath.Join("/proc", entry.Name(), "fd")
+		fds, err := ioutil.ReadDir(fdDir)
+		if err != nil {
+			continue
+		}
+
+		for _, fd := range fds {
+			fdPath := filepath.Join(fdDir, fd.Name())
+			fdInfo, err := os.Stat(fdPath)
+			if err != nil {
+				continue
+			}
+			fdStat, ok := fdInfo.Sys().(*syscall.Stat_t)
+			if !ok {
+				continue
+			}
+			if uint64(fdStat.Rdev) == targetDev {
+				return true, nil
+			}
+		}
+	}
+
+	return false, nil
+}
diff --git a/pkg/hostman/storageman/storage_slvm.go b/pkg/hostman/storageman/storage_slvm.go
@@ -25,6 +25,8 @@ import (
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/hostman/hostutils"
 	"yunion.io/x/onecloud/pkg/hostman/storageman/lvmutils"
+	"yunion.io/x/onecloud/pkg/util/fileutils2"
+	"yunion.io/x/onecloud/pkg/util/qemuimg"
 )
 
 func init() {
@@ -104,6 +106,36 @@ func (s *SSLVMStorage) GetDiskById(diskId string) (IDisk, error) {
 
 func (s *SSLVMStorage) CreateDiskFromSnapshot(ctx context.Context, disk IDisk, input *SDiskCreateByDiskinfo) (jsonutils.JSONObject, error) {
 	snapshotLocation := disk.GetSnapshotPath(input.DiskInfo.SnapshotId)
+	var activedPath = []string{}
+	var diskPath = snapshotLocation
+	var err error
+	var img *qemuimg.SQemuImage
+	for {
+		if !fileutils2.Exists(diskPath) {
+			err = lvmutils.LVActive(diskPath, s.lvmlockd, false)
+			if err != nil {
+				log.Errorf("lvactive %s failed: %s", diskPath, err)
+				break
+			}
+			activedPath = append(activedPath, diskPath)
+		}
+		img, err = qemuimg.NewQemuImage(diskPath)
+		if err != nil {
+			log.Errorf("failed open qemu image: %s, %s", diskPath, err)
+			break
+		}
+		if len(img.BackFilePath) > 0 {
+			diskPath = img.BackFilePath
+		} else {
+			break
+		}
+	}
+	if err != nil {
+		for _, apath := range activedPath {
+			lvmutils.LVDeactivate(apath)
+		}
+		return nil, err
+	}
 
 	return disk.CreateFromSnapshotLocation(ctx, snapshotLocation, int64(input.DiskInfo.DiskSizeMb), &input.DiskInfo.EncryptInfo)
 }

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,7 @@ func (self SGuestdisk) GetDiskJsonDescAtHost(ctx context.Context, host SHost,`
`237`	`237`	`desc.Url = url`
`238`	`238`	`}`
`239`	`239`	`}`
	`240`	`+ desc.SnapshotId = disk.SnapshotId`
`240`	`241`	`}`
`241`	`242`	`if fpath := disk.GetMetadata(ctx, api.DISK_META_REMOTE_ACCESS_PATH, nil); len(fpath) > 0 {`
`242`	`243`	`guest := self.getGuest()`
Original file line number	Diff line number	Diff line change
`@@ -1214,6 +1214,7 @@ func (s SKVMGuestInstance) eventBlockJobReady(event monitor.Event) {`
`1214`	`1214`	`return`
`1215`	`1215`	`}`
`1216`	`1216`	`var diskId, diskPath, diskUrl string`
	`1217`	`+ var mergeSnapshotId string`
`1217`	`1218`	`var mergeSnapshots bool`
`1218`	`1219`	`for i := 0; i < len(disks); i++ {`
`1219`	`1220`	`index := disks[i].Index`
`@@ -1222,6 +1223,7 @@ func (s SKVMGuestInstance) eventBlockJobReady(event monitor.Event) {`
`1222`	`1223`	`diskPath = disks[i].Path`
`1223`	`1224`	`diskUrl = disks[i].Url`
`1224`	`1225`	`mergeSnapshots = disks[i].MergeSnapshot`
	`1226`	`+ mergeSnapshotId = disks[i].SnapshotId`
`1225`	`1227`	`}`
`1226`	`1228`	`}`
`1227`	`1229`	`if len(diskId) == 0 {`
`@@ -1235,7 +1237,7 @@ func (s SKVMGuestInstance) eventBlockJobReady(event monitor.Event) {`
`1235`	`1237`	`return`
`1236`	`1238`	`}`
`1237`	`1239`	`if mergeSnapshots {`
`1238`		`- disk.PostCreateFromRemoteHostImage(diskUrl)`
	`1240`	`+ disk.PostCreateFromRemoteHostImage(diskUrl, mergeSnapshotId)`
`1239`	`1241`	`}`
`1240`	`1242`	`blockJobCount := s.BlockJobsCount()`
`1241`	`1243`	`if blockJobCount == 0 {`
`@@ -2165,7 +2167,7 @@ func (s *SKVMGuestInstance) delTmpDisks(ctx context.Context, migrated bool) erro`
`2165`	`2167`	`}`
`2166`	`2168`	`}`
`2167`	`2169`	`if d != nil && disk.MergeSnapshot {`
`2168`		`- d.PostCreateFromRemoteHostImage(disk.Url)`
	`2170`	`+ d.PostCreateFromRemoteHostImage(disk.Url, disk.SnapshotId)`
`2169`	`2171`	`}`
`2170`	`2172`	`if migrated {`
`2171`	`2173`	`if d != nil && utils.IsInStringArray(d.GetType(), []string{api.STORAGE_SLVM, api.STORAGE_CLVM}) {`
`@@ -2931,7 +2933,7 @@ func (s *SKVMGuestInstance) streamDisksComplete(ctx context.Context) {`
`2931`	`2933`	`if disks[i].MergeSnapshot {`
`2932`	`2934`	`if d != nil {`
`2933`	`2935`	`log.Infof("Disk %s do post create from fuse", d.GetId())`
`2934`		`- d.PostCreateFromRemoteHostImage(disks[i].Url)`
	`2936`	`+ d.PostCreateFromRemoteHostImage(disks[i].Url, disks[i].SnapshotId)`
`2935`	`2937`	`}`
`2936`	`2938`
`2937`	`2939`	`disks[i].MergeSnapshot = false`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ func (d *SLocalDisk) GetDiskSetupScripts(diskIndex int) string {`
`458`	`458`	`return cmd`
`459`	`459`	`}`
`460`	`460`
`461`		`-func (d *SLocalDisk) PostCreateFromRemoteHostImage(diskUrl string) {`
	`461`	`+func (d *SLocalDisk) PostCreateFromRemoteHostImage(diskUrl string, snapshotId string) {`
`462`	`462`	`if diskUrl != "" {`
`463`	`463`	`if err := d.RequestCloseNbdImage(context.Background(), diskUrl); err != nil {`
`464`	`464`	`log.Errorf("failed request close nbd image %s: %s", diskUrl, err)`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (d *SLVMDisk) Delete(ctx context.Context, params interface{}) (jsonutils.JS`
`176`	`176`	`return nil, nil`
`177`	`177`	`}`
`178`	`178`
`179`		`-func (d *SLVMDisk) PostCreateFromRemoteHostImage(diskUrl string) {`
	`179`	`+func (d *SLVMDisk) PostCreateFromRemoteHostImage(diskUrl string, snapshotId string) {`
`180`	`180`	`if diskUrl != "" {`
`181`	`181`	`if err := d.RequestCloseNbdImage(context.Background(), diskUrl); err != nil {`
`182`	`182`	`log.Errorf("failed request close nbd image %s: %s", diskUrl, err)`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func (d *SRBDDisk) CreateRaw(ctx context.Context, sizeMb int, diskFormat string,`
`237`	`237`	`return d.GetDiskDesc(), nil`
`238`	`238`	`}`
`239`	`239`
`240`		`-func (d *SRBDDisk) PostCreateFromRemoteHostImage(string) {`
	`240`	`+func (d *SRBDDisk) PostCreateFromRemoteHostImage(string, string) {`
`241`	`241`	`log.Errorf("Not support PostCreateFromRemoteHostImage")`
`242`	`242`	`}`
`243`	`243`