Skip to content

change-diskoffer: iops settings from new disk-offer should always used #6681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Oct 8, 2022
Merged

change-diskoffer: iops settings from new disk-offer should always used #6681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,6 +1934,18 @@ private void validateVolumeReadyStateAndHypervisorChecks(VolumeVO volume, long c
}
}

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) {
if (newDiskOffering.getRemoved() != null) {
throw new InvalidParameterValueException("Requested disk offering has been removed.");
Expand Down Expand Up @@ -1982,20 +1994,13 @@ private void validateVolumeResizeWithNewDiskOfferingAndLoad(VolumeVO volume, Dis
} else {
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)
newHypervisorSnapshotReserve[0] = volume.getHypervisorSnapshotReserve() != null ? newDiskOffering.getHypervisorSnapshotReserve() : null;
}

setNewIopsLimits(volume, newDiskOffering, newMinIops, newMaxIops);

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()));
}
Expand Down