server: fix volume offering not updated after offering change

shwstppr · shwstppr · commit e2ee57565790 · 2025-11-06T16:20:02.000+05:30
Fixes #10950 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1578,6 +1578,7 @@ private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long n
                 }
             }
 
+            volume = _volsDao.findById(volumeId);
             if (newDiskOfferingId != null) {
                 volume.setDiskOfferingId(newDiskOfferingId);
                 _volumeMgr.saveVolumeDetails(newDiskOfferingId, volume.getId());
@@ -1592,7 +1593,6 @@ private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long n
             }
 
             // Update size if volume has same size as before, else it is already updated
-            volume = _volsDao.findById(volumeId);
             if (currentSize == volume.getSize() && currentSize != newSize) {
                 volume.setSize(newSize);
             } else if (volume.getSize() != newSize) {

Original file line number	Diff line number	Diff line change
`@@ -1578,6 +1578,7 @@ private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long n`
`1578`	`1578`	`}`
`1579`	`1579`	`}`
`1580`	`1580`
	`1581`	`+ volume = _volsDao.findById(volumeId);`
`1581`	`1582`	`if (newDiskOfferingId != null) {`
`1582`	`1583`	`volume.setDiskOfferingId(newDiskOfferingId);`
`1583`	`1584`	`_volumeMgr.saveVolumeDetails(newDiskOfferingId, volume.getId());`
`@@ -1592,7 +1593,6 @@ private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long n`
`1592`	`1593`	`}`
`1593`	`1594`
`1594`	`1595`	`// Update size if volume has same size as before, else it is already updated`
`1595`		`- volume = _volsDao.findById(volumeId);`
`1596`	`1596`	`if (currentSize == volume.getSize() && currentSize != newSize) {`
`1597`	`1597`	`volume.setSize(newSize);`
`1598`	`1598`	`} else if (volume.getSize() != newSize) {`