apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: always use iops settings from new disk-offer (#6681)

Browse Source 
If you had an disk-offer which would compute-only == false,
it wouldn't apply the iop settings of the new disk-offer and instead
use null for the settings.
This commit is contained in:
Peinthor Rene 2022-10-08 08:37:37 +02:00 committed by GitHub
parent ff961c9594
commit eff10bcd8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -1945,6 +1945,18 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
} }
} }
private void setNewIopsLimits(VolumeVO volume, DiskOfferingVO newDiskOffering, Long[] newMinIops, Long[] newMaxIops) {
if (Boolean.TRUE.equals(newDiskOffering.isCustomizedIops())) {
newMinIops[0] = newMinIops[0] != null ? newMinIops[0] : volume.getMinIops();
newMaxIops[0] = newMaxIops[0] != null ? newMaxIops[0] : volume.getMaxIops();
validateIops(newMinIops[0], newMaxIops[0], volume.getPoolType());
} else {
newMinIops[0] = newDiskOffering.getMinIops();
newMaxIops[0] = newDiskOffering.getMaxIops();
}
}
private void validateVolumeResizeWithNewDiskOfferingAndLoad(VolumeVO volume, DiskOfferingVO existingDiskOffering, DiskOfferingVO newDiskOffering, Long[] newSize, Long[] newMinIops, Long[] newMaxIops, Integer[] newHypervisorSnapshotReserve) { private void validateVolumeResizeWithNewDiskOfferingAndLoad(VolumeVO volume, DiskOfferingVO existingDiskOffering, DiskOfferingVO newDiskOffering, Long[] newSize, Long[] newMinIops, Long[] newMaxIops, Integer[] newHypervisorSnapshotReserve) {
if (newDiskOffering.getRemoved() != null) { if (newDiskOffering.getRemoved() != null) {
throw new InvalidParameterValueException("Requested disk offering has been removed."); throw new InvalidParameterValueException("Requested disk offering has been removed.");
@ -1993,20 +2005,13 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
} else { } else {
newSize[0] = newDiskOffering.getDiskSize(); newSize[0] = newDiskOffering.getDiskSize();
} }
if (newDiskOffering.isCustomizedIops() != null && newDiskOffering.isCustomizedIops()) {
newMinIops[0] = newMinIops[0] != null ? newMinIops[0] : volume.getMinIops();
newMaxIops[0] = newMaxIops[0] != null ? newMaxIops[0] : volume.getMaxIops();
validateIops(newMinIops[0], newMaxIops[0], volume.getPoolType());
} else {
newMinIops[0] = newDiskOffering.getMinIops();
newMaxIops[0] = newDiskOffering.getMaxIops();
}
// if the hypervisor snapshot reserve value is null, it must remain null (currently only KVM uses null and null is all KVM uses for a value here) // if the hypervisor snapshot reserve value is null, it must remain null (currently only KVM uses null and null is all KVM uses for a value here)
newHypervisorSnapshotReserve[0] = volume.getHypervisorSnapshotReserve() != null ? newDiskOffering.getHypervisorSnapshotReserve() : null; newHypervisorSnapshotReserve[0] = volume.getHypervisorSnapshotReserve() != null ? newDiskOffering.getHypervisorSnapshotReserve() : null;
} }
setNewIopsLimits(volume, newDiskOffering, newMinIops, newMaxIops);
if (existingDiskOffering.getDiskSizeStrictness() && !(volume.getSize().equals(newSize[0]))) { if (existingDiskOffering.getDiskSizeStrictness() && !(volume.getSize().equals(newSize[0]))) {
throw new InvalidParameterValueException(String.format("Resize volume for %s is not allowed since disk offering's size is fixed", volume.getName())); throw new InvalidParameterValueException(String.format("Resize volume for %s is not allowed since disk offering's size is fixed", volume.getName()));
} }