Skip to content

Commit a5d13ea

Browse files
swordqiuwanyaoqi
andauthored
fix(host,glance): only target qcow2 set cluster size on image convert (#22991)
Co-authored-by: wanyaoqi <[email protected]>
1 parent 9504f49 commit a5d13ea

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

pkg/util/qemuimg/qemuimg.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,16 @@ func convertOther(srcInfo, destInfo SImageInfo, compact bool, workerOpions []str
393393
if destInfo.Format.String() == "vmdk" { // for esxi vmdk
394394
options = append(options, vmdkOptions(compact)...)
395395
}
396-
if destInfo.ClusterSize > 0 {
397-
options = append(options, fmt.Sprintf("cluster_size=%d", destInfo.ClusterSize))
398-
} else if srcInfo.ClusterSize > 0 {
399-
options = append(options, fmt.Sprintf("cluster_size=%d", srcInfo.ClusterSize))
396+
if destInfo.Format == qemuimgfmt.QCOW2 {
397+
if destInfo.ClusterSize > 0 {
398+
options = append(options, fmt.Sprintf("cluster_size=%d", destInfo.ClusterSize))
399+
} else if srcInfo.ClusterSize > 0 {
400+
options = append(options, fmt.Sprintf("cluster_size=%d", srcInfo.ClusterSize))
401+
}
400402
}
403+
401404
if len(options) > 0 {
402-
cmdline = append(cmdline, "-o")
403-
cmdline = append(cmdline, options...)
405+
cmdline = append(cmdline, "-o", strings.Join(options, ","))
404406
}
405407
cmdline = append(cmdline, srcInfo.Path, destInfo.Path)
406408
log.Infof("XXXX qemu-img command: %s", cmdline)

0 commit comments

Comments
 (0)