(cloudstack) branch 4.19 updated: Fix usage volume size after resizing (#9459)

[dahn]

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

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


The following commit(s) were added to refs/heads/4.19 by this push:
     new 22097027410 Fix usage volume size after resizing (#9459)
22097027410 is described below

commit 2209702741079fd8e96f43bd2b91edb6d77010c4
Author: Henrique Sato <henriquesato2...@gmail.com>
AuthorDate: Mon Aug 26 09:41:49 2024 -0300

    Fix usage volume size after resizing (#9459)
    
    Co-authored-by: Henrique Sato <henrique.s...@scclouds.com.br>
---
 .../src/main/java/com/cloud/storage/VolumeApiServiceImpl.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java 
b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 553f72b719b..e6092223f01 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1431,7 +1431,7 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
 
     private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, 
long newSize, Long newMinIops, Long newMaxIops, Integer 
newHypervisorSnapshotReserve, Long newDiskOfferingId,
                                              boolean shrinkOk) {
-        final VolumeVO volume = _volsDao.findById(volumeId);
+        VolumeVO volume = _volsDao.findById(volumeId);
         UserVmVO userVm = _userVmDao.findById(volume.getInstanceId());
         StoragePoolVO storagePool = 
_storagePoolDao.findById(volume.getPoolId());
         boolean isManaged = storagePool.isManaged();
@@ -1538,12 +1538,12 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
             }
 
             // Update size if volume has same size as before, else it is 
already updated
-            final VolumeVO volumeNow = _volsDao.findById(volumeId);
-            if (currentSize == volumeNow.getSize() && currentSize != newSize) {
+            volume = _volsDao.findById(volumeId);
+            if (currentSize == volume.getSize() && currentSize != newSize) {
                 volume.setSize(newSize);
-            } else if (volumeNow.getSize() != newSize) {
+            } else if (volume.getSize() != newSize) {
                 // consider the updated size as the new size
-                newSize = volumeNow.getSize();
+                newSize = volume.getSize();
             }
 
             _volsDao.update(volume.getId(), volume);