From 10f4de031813fff92f1128273a131313fbc603ef Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 10 Jun 2024 14:08:31 +0530 Subject: [PATCH 1/2] kvm: consider provisioning type for local data volumes (#9141) Fixes #8644 Signed-off-by: Abhishek Kumar --- .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index bdaa419c698..9d62925e134 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -842,7 +842,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { destFile.setFormat(format); destFile.setSize(size); Map options = new HashMap(); - if (pool.getType() == StoragePoolType.NetworkFilesystem){ + if (List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.Filesystem).contains(pool.getType())) { options.put("preallocation", QemuImg.PreallocationType.getPreallocationType(provisioningType).toString()); } From 0b54fbb5399213910afedc9bcd341e9a11cef163 Mon Sep 17 00:00:00 2001 From: Oleg Chuev <91337563+OlegChuev@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:50:52 +0300 Subject: [PATCH 2/2] ui: Updated units names (#8543) * Updated units names * Update ui/public/locales/en.json * Update ui/public/locales/en.json --------- Co-authored-by: Rohit Yadav --- ui/public/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index d7e3c51c1ea..e5f264cb470 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1260,7 +1260,7 @@ "label.miniops": "Min IOPS", "label.minmaxiops": "Min IOPS / Max IOPS", "label.minmembers": "Min members", -"label.minmemory": "Min memory (in MB)", +"label.minmemory": "Min. memory (MiB)", "label.minorsequence": "Minor Sequence", "label.minsize": "Minimum size", "label.minute.past.hour": "minute(s) past the hour",