Skip to content

Commit d559f21

Browse files
authored
fix(host,glance): only target qcow2 set cluster size on image convert (#22981)
1 parent 21867bd commit d559f21

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
@@ -397,14 +397,16 @@ func convertOther(srcInfo, destInfo SImageInfo, compact bool, workerOpions []str
397397
if destInfo.Format.String() == "vmdk" { // for esxi vmdk
398398
options = append(options, vmdkOptions(compact)...)
399399
}
400-
if destInfo.ClusterSize > 0 {
401-
options = append(options, fmt.Sprintf("cluster_size=%d", destInfo.ClusterSize))
402-
} else if srcInfo.ClusterSize > 0 {
403-
options = append(options, fmt.Sprintf("cluster_size=%d", srcInfo.ClusterSize))
400+
if destInfo.Format == qemuimgfmt.QCOW2 {
401+
if destInfo.ClusterSize > 0 {
402+
options = append(options, fmt.Sprintf("cluster_size=%d", destInfo.ClusterSize))
403+
} else if srcInfo.ClusterSize > 0 {
404+
options = append(options, fmt.Sprintf("cluster_size=%d", srcInfo.ClusterSize))
405+
}
404406
}
407+
405408
if len(options) > 0 {
406-
cmdline = append(cmdline, "-o")
407-
cmdline = append(cmdline, options...)
409+
cmdline = append(cmdline, "-o", strings.Join(options, ","))
408410
}
409411
cmdline = append(cmdline, srcInfo.Path, destInfo.Path)
410412
log.Infof("XXXX qemu-img command: %s", cmdline)

0 commit comments

Comments
 (0)