(cloudstack) branch 4.19 updated: engine-storage: Set SecretConsumerDetail for VM live migration with storage on shared NFS (#9222)

[rohit]

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

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


The following commit(s) were added to refs/heads/4.19 by this push:
     new 22c6f08f77b engine-storage: Set SecretConsumerDetail for VM live 
migration with storage on shared NFS (#9222)
22c6f08f77b is described below

commit 22c6f08f77b33126ca002751bdb596b5dae0bb14
Author: Abhisar Sinha <63767682+abh1...@users.noreply.github.com>
AuthorDate: Thu Nov 7 14:45:04 2024 +0530

    engine-storage: Set SecretConsumerDetail for VM live migration with storage 
on shared NFS (#9222)
    
    * engine-storage-datamotion: Set SecretConsumerDetail for VM live migration 
with storage on shared NFS
    
    * VM live migration - powerflex encrypted volume
    
    * rename isPowerFlex
---
 .../cloudstack/storage/motion/StorageSystemDataMotionStrategy.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
 
b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index 82f9a84cdb5..0efc0b7dc1c 100644
--- 
a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ 
b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -2077,8 +2077,8 @@ public class StorageSystemDataMotionStrategy implements 
DataMotionStrategy {
                     migrateDiskInfo = configureMigrateDiskInfo(srcVolumeInfo, 
destPath, backingPath);
                     
migrateDiskInfo.setSourceDiskOnStorageFileSystem(isStoragePoolTypeOfFile(sourceStoragePool));
                     migrateDiskInfoList.add(migrateDiskInfo);
-                    prepareDiskWithSecretConsumerDetail(vmTO, srcVolumeInfo, 
destVolumeInfo.getPath());
                 }
+                prepareDiskWithSecretConsumerDetail(vmTO, srcVolumeInfo, 
destVolumeInfo.getPath());
 
                 migrateStorage.put(srcVolumeInfo.getPath(), migrateDiskInfo);
 
@@ -2478,7 +2478,8 @@ public class StorageSystemDataMotionStrategy implements 
DataMotionStrategy {
                 throw new CloudRuntimeException("Destination storage pool with 
ID " + dataStore.getId() + " was not located.");
             }
 
-            if (srcStoragePoolVO.isManaged() && srcStoragePoolVO.getId() != 
destStoragePoolVO.getId()) {
+            boolean isSrcAndDestPoolPowerFlexStorage = 
srcStoragePoolVO.getPoolType().equals(Storage.StoragePoolType.PowerFlex) && 
destStoragePoolVO.getPoolType().equals(Storage.StoragePoolType.PowerFlex);
+            if (srcStoragePoolVO.isManaged() && 
!isSrcAndDestPoolPowerFlexStorage && srcStoragePoolVO.getId() != 
destStoragePoolVO.getId()) {
                 throw new CloudRuntimeException("Migrating a volume online 
with KVM from managed storage is not currently supported.");
             }