DaanHoogland commented on code in PR #6587:
URL: https://github.com/apache/cloudstack/pull/6587#discussion_r936754491
##########
engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java:
##########
@@ -678,6 +682,32 @@ protected void updateVolumeInfo(VolumeObjectTO newVolume,
VolumeVO volumeVo, boo
s_logger.debug(String.format("Updated %s from %s to %s ",
volumeVo.getVolumeDescription(), previousValues, newValues));
}
+ protected void updateResourceCount(VolumeObjectTO newVolume, VolumeVO
volumeVo) {
+ if (newVolume == null || newVolume.getSize() == null || volumeVo ==
null || volumeVo.getSize() == null) {
+ return;
+ }
+
+ Long newVolumeSize = newVolume.getSize();
+ if (newVolumeSize == volumeVo.getSize()) {
+ // Volume size already updated, check with earlier vo in the object
+ if (volumeVO.getSize() != null && volumeVO.getSize() !=
newVolumeSize) {
+ Long oldVolumeSize = volumeVO.getSize();
+ if (oldVolumeSize < newVolumeSize) {
+
resourceLimitMgr.incrementResourceCount(volumeVo.getAccountId(),
ResourceType.primary_storage, volumeVo.isDisplayVolume(), newVolumeSize -
oldVolumeSize);
+ } else {
+
resourceLimitMgr.decrementResourceCount(volumeVo.getAccountId(),
ResourceType.primary_storage, volumeVo.isDisplayVolume(), oldVolumeSize -
newVolumeSize);
+ }
+ }
+ } else {
+ Long oldVolumeSize = volumeVo.getSize();
+ if (oldVolumeSize < newVolumeSize) {
+
resourceLimitMgr.incrementResourceCount(volumeVo.getAccountId(),
ResourceType.primary_storage, volumeVo.isDisplayVolume(), newVolumeSize -
oldVolumeSize);
+ } else {
+
resourceLimitMgr.decrementResourceCount(volumeVo.getAccountId(),
ResourceType.primary_storage, volumeVo.isDisplayVolume(), oldVolumeSize -
newVolumeSize);
+ }
+ }
Review Comment:
```suggestion
long newVolumeSize = newVolume.getSize();
long oldVolumeSize = oldVolume.getSize();
if (newVolumeSize != oldVolumeSize) {
if (oldVolumeSize < newVolumeSize) {
resourceLimitMgr.incrementResourceCount(oldVolume.getAccountId(),
ResourceType.primary_storage, oldVolume.isDisplayVolume(), newVolumeSize -
oldVolumeSize);
} else {
resourceLimitMgr.decrementResourceCount(oldVolume.getAccountId(),
ResourceType.primary_storage, oldVolume.isDisplayVolume(), oldVolumeSize -
newVolumeSize);
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
