(cloudstack) branch 4.18 updated: Enable over provisioning for SharedMountPoint primary storages (#8481)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 2729ee110eb Enable over provisioning for SharedMountPoint primary 
storages (#8481)
2729ee110eb is described below

commit 2729ee110eba9a7ba3117af3b8033bdf2032585b
Author: Daniel Augusto Veronezi Salvador 
<38945620+gutoveron...@users.noreply.github.com>
AuthorDate: Fri Feb 9 05:35:34 2024 -0300

    Enable over provisioning for SharedMountPoint primary storages (#8481)
    
    * Enable over provisioning for SharedMountPoint primary storages
    
    * Fix unit tests
    
    * Fix typos and small adjusts
    
    ---------
    
    Co-authored-by: Daniel Augusto Veronezi Salvador <gutoveron...@apache.org>
---
 api/src/main/java/com/cloud/storage/Storage.java     | 16 +++++++++-------
 api/src/test/java/com/cloud/storage/StorageTest.java |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/com/cloud/storage/Storage.java 
b/api/src/main/java/com/cloud/storage/Storage.java
index c6dee56fa22..ad04a7a5fb2 100644
--- a/api/src/main/java/com/cloud/storage/Storage.java
+++ b/api/src/main/java/com/cloud/storage/Storage.java
@@ -138,7 +138,7 @@ public class Storage {
         LVM(false, false, false), // XenServer local LVM SR
         CLVM(true, false, false),
         RBD(true, true, false), // 
http://libvirt.org/storage.html#StorageBackendRBD
-        SharedMountPoint(true, false, true),
+        SharedMountPoint(true, true, true),
         VMFS(true, true, false), // VMware VMFS storage
         PreSetup(true, true, false), // for XenServer, Storage Pool is set up 
by customers.
         EXT(false, true, false), // XenServer local EXT SR
@@ -152,12 +152,12 @@ public class Storage {
         StorPool(true, true, true);
 
         private final boolean shared;
-        private final boolean overprovisioning;
+        private final boolean overProvisioning;
         private final boolean encryption;
 
-        StoragePoolType(boolean shared, boolean overprovisioning, boolean 
encryption) {
+        StoragePoolType(boolean shared, boolean overProvisioning, boolean 
encryption) {
             this.shared = shared;
-            this.overprovisioning = overprovisioning;
+            this.overProvisioning = overProvisioning;
             this.encryption = encryption;
         }
 
@@ -166,14 +166,16 @@ public class Storage {
         }
 
         public boolean supportsOverProvisioning() {
-            return overprovisioning;
+            return overProvisioning;
         }
 
-        public boolean supportsEncryption() { return encryption; }
+        public boolean supportsEncryption() {
+            return encryption;
+        }
     }
 
     public static List<StoragePoolType> getNonSharedStoragePoolTypes() {
-        List<StoragePoolType> nonSharedStoragePoolTypes = new 
ArrayList<StoragePoolType>();
+        List<StoragePoolType> nonSharedStoragePoolTypes = new ArrayList<>();
         for (StoragePoolType storagePoolType : StoragePoolType.values()) {
             if (!storagePoolType.isShared()) {
                 nonSharedStoragePoolTypes.add(storagePoolType);
diff --git a/api/src/test/java/com/cloud/storage/StorageTest.java 
b/api/src/test/java/com/cloud/storage/StorageTest.java
index 951ee9fe76a..76fd5c5d3a4 100644
--- a/api/src/test/java/com/cloud/storage/StorageTest.java
+++ b/api/src/test/java/com/cloud/storage/StorageTest.java
@@ -52,7 +52,7 @@ public class StorageTest {
     }
 
     @Test
-    public void supportsOverprovisioningStoragePool() {
+    public void supportsOverProvisioningTestAllStoragePoolTypes() {
         
Assert.assertTrue(StoragePoolType.Filesystem.supportsOverProvisioning());
         
Assert.assertTrue(StoragePoolType.NetworkFilesystem.supportsOverProvisioning());
         
Assert.assertFalse(StoragePoolType.IscsiLUN.supportsOverProvisioning());
@@ -63,7 +63,7 @@ public class StorageTest {
         Assert.assertFalse(StoragePoolType.CLVM.supportsOverProvisioning());
         Assert.assertTrue(StoragePoolType.RBD.supportsOverProvisioning());
         
Assert.assertTrue(StoragePoolType.PowerFlex.supportsOverProvisioning());
-        
Assert.assertFalse(StoragePoolType.SharedMountPoint.supportsOverProvisioning());
+        
Assert.assertTrue(StoragePoolType.SharedMountPoint.supportsOverProvisioning());
         Assert.assertTrue(StoragePoolType.VMFS.supportsOverProvisioning());
         Assert.assertTrue(StoragePoolType.PreSetup.supportsOverProvisioning());
         Assert.assertTrue(StoragePoolType.EXT.supportsOverProvisioning());