Skip to content

engine-storage: Set SecretConsumerDetail for VM live migration with storage on shared NFS #9222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 8 commits into from
Nov 7, 2024
Merged

engine-storage: Set SecretConsumerDetail for VM live migration with storage on shared NFS #9222

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1d3315
engine-storage-datamotion: Set SecretConsumerDetail for VM live migra…
abh1sar Jun 11, 2024
8e95d94
VM live migration - powerflex encrypted volume
abh1sar Jun 12, 2024
396ac29
Merge remote-tracking branch 'upstream/4.19' into secret
abh1sar Jun 26, 2024
51ae90e
rename isPowerFlex
abh1sar Jun 26, 2024
442b43b
Merge branch '4.19' into 4.19
abh1sar Jun 28, 2024
e46ac53
Merge branch '4.19' into 4.19
abh1sar Aug 20, 2024
3338e05
Merge branch '4.19' into 4.19
abh1sar Aug 23, 2024
487b788
Merge branch '4.19' into 4.19
abh1sar Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...n/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,8 +2082,8 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
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);

Expand Down Expand Up @@ -2469,7 +2469,8 @@ protected void verifyLiveMigrationForKVM(Map<VolumeInfo, DataStore> volumeDataSt
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.");
}

Expand Down