[cloudstack] branch 4.16 updated: kvm: Set RAW format to RBD DATADISK (#5801)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.16 by this push:
     new 48006de  kvm: Set RAW format to RBD DATADISK (#5801)
48006de is described below

commit 48006de3e3ae74c34bf5ba0794c6eee4aa76746a
Author: slavkap <51903378+slav...@users.noreply.github.com>
AuthorDate: Sat Jan 8 05:24:21 2022 +0200

    kvm: Set RAW format to RBD DATADISK (#5801)
    
    While deploying a VM with data disk on Ceph the volume format was in
    QCOW2.
    
    Fixes #5531
---
 .../main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 1b11b41..9cd6c5a 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -1463,7 +1463,7 @@ public class KVMStorageProcessor implements 
StorageProcessor {
             primaryPool = 
storagePoolMgr.getStoragePool(primaryStore.getPoolType(), 
primaryStore.getUuid());
             disksize = volume.getSize();
             PhysicalDiskFormat format;
-            if (volume.getFormat() == null) {
+            if (volume.getFormat() == null || 
StoragePoolType.RBD.equals(primaryStore.getPoolType())) {
                 format = primaryPool.getDefaultFormat();
             } else {
                 format = 
PhysicalDiskFormat.valueOf(volume.getFormat().toString().toUpperCase());