Merge remote-tracking branch 'origin/4.19'

rohityadavcloud · rohityadavcloud · commit 8d211e75c01a · 2024-06-10T16:18:41.000+05:30
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
@@ -848,7 +848,7 @@ private KVMPhysicalDisk createPhysicalDiskByQemuImg(String name, KVMStoragePool
         destFile.setFormat(format);
         destFile.setSize(size);
         Map<String, String> options = new HashMap<String, String>();
-        if (pool.getType() == StoragePoolType.NetworkFilesystem){
+        if (List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.Filesystem).contains(pool.getType())) {
             options.put("preallocation", QemuImg.PreallocationType.getPreallocationType(provisioningType).toString());
         }
 
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -1375,7 +1375,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",

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ private KVMPhysicalDisk createPhysicalDiskByQemuImg(String name, KVMStoragePool`
`848`	`848`	`destFile.setFormat(format);`
`849`	`849`	`destFile.setSize(size);`
`850`	`850`	`Map<String, String> options = new HashMap<String, String>();`
`851`		`- if (pool.getType() == StoragePoolType.NetworkFilesystem){`
	`851`	`+ if (List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.Filesystem).contains(pool.getType())) {`
`852`	`852`	`options.put("preallocation", QemuImg.PreallocationType.getPreallocationType(provisioningType).toString());`
`853`	`853`	`}`
`854`	`854`