Skip to content

Commit b14efa8

Browse files
Fix resize volume operation to update the VM settings
1 parent 1117363 commit b14efa8

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.cloud.service.ServiceOfferingVO;
4040
import com.cloud.service.dao.ServiceOfferingDao;
4141
import com.cloud.vm.DiskProfile;
42+
import com.cloud.vm.UserVmDetailVO;
4243
import org.apache.cloudstack.api.ApiErrorCode;
4344
import org.apache.cloudstack.api.ServerApiException;
4445
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
@@ -327,6 +328,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
327328
private final StateMachine2<Volume.State, Volume.Event, Volume> _volStateMachine;
328329

329330
private static final Set<Volume.State> STATES_VOLUME_CANNOT_BE_DESTROYED = new HashSet<>(Arrays.asList(Volume.State.Destroy, Volume.State.Expunging, Volume.State.Expunged, Volume.State.Allocated));
331+
private static final long GiB_TO_BYTES = 1024 * 1024 * 1024;
330332

331333
protected VolumeApiServiceImpl() {
332334
_volStateMachine = Volume.State.getStateMachine();
@@ -1381,6 +1383,13 @@ private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long n
13811383
}
13821384

13831385
_volsDao.update(volume.getId(), volume);
1386+
if (userVm != null) {
1387+
UserVmDetailVO userVmDetailVO = userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
1388+
if (userVmDetailVO != null) {
1389+
userVmDetailVO.setValue(String.valueOf(newSize/ GiB_TO_BYTES));
1390+
userVmDetailsDao.update(userVmDetailVO.getId(), userVmDetailVO);
1391+
}
1392+
}
13841393

13851394
/* Update resource count for the account on primary storage resource */
13861395
if (!shrinkOk) {

ui/src/views/compute/DeployVM.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,6 +1180,7 @@ export default {
11801180
if (this.rootDiskSelected?.id) {
11811181
instanceConfig.overridediskofferingid = this.rootDiskSelected.id
11821182
}
1183+
console.log('overrided value ' + instanceConfig.overridediskofferingid)
11831184
if (instanceConfig.overridediskofferingid) {
11841185
this.overrideDiskOffering = _.find(this.options.diskOfferings, (option) => option.id === instanceConfig.overridediskofferingid)
11851186
} else {

0 commit comments

Comments
 (0)