Skip to content

Commit 2729ee1

Browse files
authored
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 <gutoveronezi@apache.org>
1 parent 56f0448 commit 2729ee1

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

api/src/main/java/com/cloud/storage/Storage.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static enum StoragePoolType {
138138
LVM(false, false, false), // XenServer local LVM SR
139139
CLVM(true, false, false),
140140
RBD(true, true, false), // http://libvirt.org/storage.html#StorageBackendRBD
141-
SharedMountPoint(true, false, true),
141+
SharedMountPoint(true, true, true),
142142
VMFS(true, true, false), // VMware VMFS storage
143143
PreSetup(true, true, false), // for XenServer, Storage Pool is set up by customers.
144144
EXT(false, true, false), // XenServer local EXT SR
@@ -152,12 +152,12 @@ public static enum StoragePoolType {
152152
StorPool(true, true, true);
153153

154154
private final boolean shared;
155-
private final boolean overprovisioning;
155+
private final boolean overProvisioning;
156156
private final boolean encryption;
157157

158-
StoragePoolType(boolean shared, boolean overprovisioning, boolean encryption) {
158+
StoragePoolType(boolean shared, boolean overProvisioning, boolean encryption) {
159159
this.shared = shared;
160-
this.overprovisioning = overprovisioning;
160+
this.overProvisioning = overProvisioning;
161161
this.encryption = encryption;
162162
}
163163

@@ -166,14 +166,16 @@ public boolean isShared() {
166166
}
167167

168168
public boolean supportsOverProvisioning() {
169-
return overprovisioning;
169+
return overProvisioning;
170170
}
171171

172-
public boolean supportsEncryption() { return encryption; }
172+
public boolean supportsEncryption() {
173+
return encryption;
174+
}
173175
}
174176

175177
public static List<StoragePoolType> getNonSharedStoragePoolTypes() {
176-
List<StoragePoolType> nonSharedStoragePoolTypes = new ArrayList<StoragePoolType>();
178+
List<StoragePoolType> nonSharedStoragePoolTypes = new ArrayList<>();
177179
for (StoragePoolType storagePoolType : StoragePoolType.values()) {
178180
if (!storagePoolType.isShared()) {
179181
nonSharedStoragePoolTypes.add(storagePoolType);

api/src/test/java/com/cloud/storage/StorageTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void isSharedStoragePool() {
5252
}
5353

5454
@Test
55-
public void supportsOverprovisioningStoragePool() {
55+
public void supportsOverProvisioningTestAllStoragePoolTypes() {
5656
Assert.assertTrue(StoragePoolType.Filesystem.supportsOverProvisioning());
5757
Assert.assertTrue(StoragePoolType.NetworkFilesystem.supportsOverProvisioning());
5858
Assert.assertFalse(StoragePoolType.IscsiLUN.supportsOverProvisioning());
@@ -63,7 +63,7 @@ public void supportsOverprovisioningStoragePool() {
6363
Assert.assertFalse(StoragePoolType.CLVM.supportsOverProvisioning());
6464
Assert.assertTrue(StoragePoolType.RBD.supportsOverProvisioning());
6565
Assert.assertTrue(StoragePoolType.PowerFlex.supportsOverProvisioning());
66-
Assert.assertFalse(StoragePoolType.SharedMountPoint.supportsOverProvisioning());
66+
Assert.assertTrue(StoragePoolType.SharedMountPoint.supportsOverProvisioning());
6767
Assert.assertTrue(StoragePoolType.VMFS.supportsOverProvisioning());
6868
Assert.assertTrue(StoragePoolType.PreSetup.supportsOverProvisioning());
6969
Assert.assertTrue(StoragePoolType.EXT.supportsOverProvisioning());

0 commit comments

Comments
 (0)