From 7d2c2d58b2bb83d6d9b4695180e2d84fce5e0584 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Sat, 3 Sep 2022 09:58:29 -0600 Subject: [PATCH] Allow caching for ScaleIO qemu-img data copy --- .../cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java index ec453abede9..dfa41728038 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java @@ -179,7 +179,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor { disk.setFormat(QemuImg.PhysicalDiskFormat.QCOW2); disk.setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS); try (KeyFile keyFile = new KeyFile(passphrase)){ - QemuImg qemuImg = new QemuImg(0, true, true); + QemuImg qemuImg = new QemuImg(0, true, false); Map options = new HashMap<>(); List qemuObjects = new ArrayList<>(); long formattedSize = getUsableBytesFromRawBytes(disk.getSize()); @@ -352,7 +352,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor { CryptSetup cryptSetup = null; try (KeyFile srcKey = new KeyFile(srcPassphrase); KeyFile dstKey = new KeyFile(dstPassphrase)){ - qemu = new QemuImg(timeout, provisioningType.equals(Storage.ProvisioningType.FAT), true); + qemu = new QemuImg(timeout, provisioningType.equals(Storage.ProvisioningType.FAT), false); String srcPath = disk.getPath(); String destPath = destDisk.getPath(); @@ -477,7 +477,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor { QemuImgFile srcFile = null; QemuImgFile destFile = null; try { - QemuImg qemu = new QemuImg(timeout, true, true); + QemuImg qemu = new QemuImg(timeout, true, false); destDisk = destPool.getPhysicalDisk(destTemplatePath); if (destDisk == null) { LOGGER.error("Failed to find the disk: " + destTemplatePath + " of the storage pool: " + destPool.getUuid());