[cloudstack] branch 4.18 updated: Set encrypted PowerFlex disk format correctly (#7735)

[harikrishna]

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

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


The following commit(s) were added to refs/heads/4.18 by this push:
     new 63216425d5b Set encrypted PowerFlex disk format correctly (#7735)
63216425d5b is described below

commit 63216425d5beaa3ca25597cd6b5319c189179bab
Author: Marcus Sorensen <marcus_soren...@apple.com>
AuthorDate: Mon Jul 24 01:43:46 2023 -0600

    Set encrypted PowerFlex disk format correctly (#7735)
    
    Co-authored-by: Marcus Sorensen <m...@apple.com>
---
 .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java     | 3 +++
 .../storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java   | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

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 fd23d23745c..69c28d4350a 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
@@ -1609,6 +1609,9 @@ public class KVMStorageProcessor implements 
StorageProcessor {
                 if (vol.getQemuEncryptFormat() != null) {
                     
newVol.setEncryptFormat(vol.getQemuEncryptFormat().toString());
                 }
+                if (vol.getFormat() != null) {
+                    format = vol.getFormat();
+                }
             }
             newVol.setSize(volume.getSize());
             
newVol.setFormat(ImageFormat.valueOf(format.toString().toUpperCase()));
diff --git 
a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
 
b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
index 3a285b49904..cad88dcdd15 100644
--- 
a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
+++ 
b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
@@ -504,11 +504,7 @@ public class ScaleIOPrimaryDataStoreDriver implements 
PrimaryDataStoreDriver {
             volume.setFolder(scaleIOVolume.getVtreeId());
             volume.setSize(scaleIOVolume.getSizeInKb() * 1024);
             volume.setPoolType(Storage.StoragePoolType.PowerFlex);
-            if (volumeInfo.getVolumeType().equals(Volume.Type.ROOT)) {
-                volume.setFormat(volumeInfo.getFormat());
-            } else {
-                volume.setFormat(Storage.ImageFormat.RAW);
-            }
+            volume.setFormat(volumeInfo.getFormat());
             volume.setPoolId(storagePoolId);
             VolumeObject createdObject = 
VolumeObject.getVolumeObject(volumeInfo.getDataStore(), volume);
             createdObject.update();
@@ -1202,7 +1198,7 @@ public class ScaleIOPrimaryDataStoreDriver implements 
PrimaryDataStoreDriver {
 
             if (payload.instanceName != null) {
                 VMInstanceVO instance = 
vmInstanceDao.findVMByInstanceName(payload.instanceName);
-                if (instance.getState().equals(VirtualMachine.State.Running)) {
+                if (instance != null && 
instance.getState().equals(VirtualMachine.State.Running)) {
                     hostId = instance.getHostId();
                     attachedRunning = true;
                 }