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 #14283 from swordqiu/hotfix/qj-fail-to-convert-vmdk-image

Browse Source 
fix: fail to recogonize vmdk image
This commit is contained in:
Zexi Li
2022-05-22 22:01:35 +08:00
committed by GitHub
parent 8e233d4bce 0f80bc05f4
commit e6c069f3f4
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/images.go
+4 -2
View File
@@ -1030,7 +1030,8 @@ func (self *SImage) newSubformat(ctx context.Context, format qemuimg.TImageForma
subformat.Size = self.Size
subformat.Checksum = self.Checksum
subformat.FastHash = self.FastHash
subformat.Status = self.Status
// saved successfully
subformat.Status = api.IMAGE_STATUS_ACTIVE
subformat.Location = self.Location
} else {
subformat.Status = api.IMAGE_STATUS_QUEUED
@@ -1880,6 +1881,7 @@ func (img *SImage) doConvert(ctx context.Context, userCred mcclient.TokenCredent
if err != nil {
return false, errors.Wrap(err, "cleanup sub image")
}
continue
}
subimgs[i].checkStatus(true, false)
if subimgs[i].Status != api.IMAGE_STATUS_ACTIVE {
@@ -1888,7 +1890,7 @@ func (img *SImage) doConvert(ctx context.Context, userCred mcclient.TokenCredent
}
}
log.Debugf("doConvert imageStatus %s %v", img.Status, needConvert)
if (img.Status == api.IMAGE_STATUS_SAVED || img.Status == api.IMAGE_STATUS_ACTIVE) && needConvert {
if (img.Status == api.IMAGE_STATUS_SAVED || img.Status == api.IMAGE_STATUS_ACTIVE || img.Status == api.IMAGE_STATUS_PROBING) && needConvert {
err := img.migrateSubImage(ctx)
if err != nil {
return false, errors.Wrap(err, "migrateSubImage")
pkg/util/qemuimg/qemuimg.go
+40
View File
@@ -117,6 +117,33 @@ func (img *SQemuImage) parse() error {
if err != nil {
return err
}
/*
{
"virtual-size": 107374182400,
"filename": "/opt/cloud/workspace/data/glance/images/3ccecd2b-0ab4-4525-8e64-6f1d3c3a2457",
"cluster-size": 65536,
"format": "vmdk",
"actual-size": 2173186048,
"format-specific": {
"type": "vmdk",
"data": {
"cid": 3046516340,
"parent-cid": 4294967295,
"create-type": "streamOptimized",
"extents": [
{
"compressed": true,
"virtual-size": 107374182400,
"filename": "/opt/cloud/workspace/data/glance/images/3ccecd2b-0ab4-4525-8e64-6f1d3c3a2457",
"cluster-size": 65536,
"format": ""
}
]
}
},
"dirty-flag": false
}
*/
info := struct {
VirtualSizeBytes int64 `json:"virtual-size"`
@@ -131,6 +158,16 @@ func (img *SQemuImage) parse() error {
FormatSpecific struct {
Type string `json:"type"`
Data struct {
Cid uint64 `json:"cid"`
ParentCid uint64 `json:"parent-cid"`
CreateType string `json:"create-type"`
Extents []struct {
Compressed bool `json:"compressed"`
VirtualSize uint64 `json:"virtual-size"`
Filename string `json:"filename"`
ClusterSize uint64 `json:"cluster-size"`
Format string `json:"format"`
} `json:"extents"`
Compat string `json:"compat"`
LazyRefcounts int `json:"lazy-refcounts"`
RefcountBits int `json:"refcount-bits"`
@@ -163,6 +200,9 @@ func (img *SQemuImage) parse() error {
return errors.Wrap(err, "ParseQemuFilepath")
}
img.Subformat = info.CreateType
if img.Subformat == "" {
img.Subformat = info.FormatSpecific.Data.CreateType
}
if img.Encrypted {
img.EncryptFormat = TEncryptFormat(info.FormatSpecific.Data.Encrypt.Format)