slavkap commented on code in PR #8873:
URL: https://github.com/apache/cloudstack/pull/8873#discussion_r1560787113
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java:
##########
@@ -1936,26 +1938,38 @@ protected void manuallyDeleteUnusedSnapshotFile(boolean
isLibvirtSupportingFlagD
* @param snapshotPath Path to convert the base file;
* @return null if the conversion occurs successfully or an error message
that must be handled.
*/
- protected String
convertBaseFileToSnapshotFileInPrimaryStorageDir(KVMStoragePool primaryPool,
String baseFile, String snapshotPath, VolumeObjectTO volume, int wait) {
- try {
- s_logger.debug(String.format("Trying to convert volume [%s] (%s)
to snapshot [%s].", volume, baseFile, snapshotPath));
+ protected String
convertBaseFileToSnapshotFileInPrimaryStorageDir(KVMStoragePool primaryPool,
+ KVMPhysicalDisk baseFile, String snapshotPath, VolumeObjectTO
volume, int wait) {
+ try (KeyFile srcKey = new KeyFile(volume.getPassphrase())) {
+ s_logger.debug(
+ String.format("Trying to convert volume [%s] (%s) to
snapshot [%s].", volume, baseFile, snapshotPath));
primaryPool.createFolder(TemplateConstants.DEFAULT_SNAPSHOT_ROOT_DIR);
-
- QemuImgFile srcFile = new QemuImgFile(baseFile);
+ String srcKeyName = "sec0";
+ List<QemuObject> qemuObjects = new ArrayList<>();
+ Map<String, String> options = new HashMap<>();
+ QemuImageOptions qemuImageOpts = new
QemuImageOptions(baseFile.getPath());
+ if (srcKey.isSet()) {
+
qemuObjects.add(QemuObject.prepareSecretForQemuImg(baseFile.getFormat(),
+ EncryptFormat.LUKS, srcKey.toString(), srcKeyName,
options));
+ qemuImageOpts = new QemuImageOptions(baseFile.getFormat(),
baseFile.getPath(), srcKeyName);
+ }
+ QemuImgFile srcFile = new QemuImgFile(baseFile.getPath());
Review Comment:
thanks, @DaanHoogland for the review!
The requested change has been addressed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
