Allow to configure root disk size via Service Offering (diskoffering of type Service). (#4341)

GabrielBrascher · web-flow · commit b3a1cb41c81b · 2020-10-30T15:56:11.000Z
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -127,6 +127,9 @@ public class CreateServiceOfferingCmd extends BaseCmd {
     @Parameter(name = ApiConstants.SERVICE_OFFERING_DETAILS, type = CommandType.MAP, description = "details for planner, used to store specific parameters")
     private Map details;
 
+    @Parameter(name = ApiConstants.ROOT_DISK_SIZE, type = CommandType.LONG, since = "4.15", description = "the Root disk size in GB.")
+    private Long rootDiskSize;
+
     @Parameter(name = ApiConstants.BYTES_READ_RATE, type = CommandType.LONG, required = false, description = "bytes read rate of the disk offering")
     private Long bytesReadRate;
 
@@ -324,6 +327,10 @@ public Map<String, String> getDetails() {
         return detailsMap;
     }
 
+    public Long getRootDiskSize() {
+        return rootDiskSize;
+    }
+
     public Long getBytesReadRate() {
         return bytesReadRate;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@ -87,6 +87,13 @@ public ResizeVolumeCmd(Long id, Long minIops, Long maxIops) {
         this.maxIops = maxIops;
     }
 
+    public ResizeVolumeCmd(Long id, Long minIops, Long maxIops, long diskOfferingId) {
+        this.id = id;
+        this.minIops = minIops;
+        this.maxIops = maxIops;
+        this.newDiskOfferingId = diskOfferingId;
+    }
+
     //TODO use the method getId() instead of this one.
     public Long getEntityId() {
         return id;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -200,6 +200,10 @@ public class ServiceOfferingResponse extends BaseResponse {
     @Param(description = "the vsphere storage policy tagged to the service offering in case of VMware", since = "4.15")
     private String vsphereStoragePolicy;
 
+    @SerializedName(ApiConstants.ROOT_DISK_SIZE)
+    @Param(description = "Root disk size in GB", since = "4.15")
+    private Long rootDiskSize;
+
     public ServiceOfferingResponse() {
     }
 
@@ -468,4 +472,7 @@ public void setVsphereStoragePolicy(String vsphereStoragePolicy) {
         this.vsphereStoragePolicy = vsphereStoragePolicy;
     }
 
+    public void setRootDiskSize(Long rootDiskSize) {
+        this.rootDiskSize = rootDiskSize;
+    }
 }
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql
@@ -406,6 +406,7 @@ CREATE VIEW `cloud`.`service_offering_view` AS
         `disk_offering`.`iops_write_rate_max` AS `iops_write_rate_max`,
         `disk_offering`.`iops_write_rate_max_length` AS `iops_write_rate_max_length`,
         `disk_offering`.`cache_mode` AS `cache_mode`,
+        `disk_offering`.`disk_size` AS `root_disk_size`,
         `service_offering`.`cpu` AS `cpu`,
         `service_offering`.`speed` AS `speed`,
         `service_offering`.`ram_size` AS `ram_size`,
@@ -821,7 +822,6 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers
 INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '6.7.2', 'solaris11_64Guest', 328, now(), 0);
 INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '6.7.3', 'solaris11_64Guest', 328, now(), 0);
 
-
 -- Add  VMware Photon (64 bit)     as support guest os
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (329, UUID(), 7, 'VMware Photon (64 bit)', now());
 -- VMware Photon (64 bit)    VMWare guest os mapping
diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
@@ -113,6 +113,7 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO
         offeringResponse.setObjectName("serviceoffering");
         offeringResponse.setIscutomized(offering.isDynamic());
         offeringResponse.setCacheMode(offering.getCacheMode());
+
         if (offeringDetails != null && !offeringDetails.isEmpty()) {
             String vsphereStoragePolicyId = offeringDetails.get(ApiConstants.STORAGE_POLICY);
             if (vsphereStoragePolicyId != null) {
@@ -121,6 +122,9 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO
                     offeringResponse.setVsphereStoragePolicy(vsphereStoragePolicyVO.getName());
             }
         }
+
+        offeringResponse.setRootDiskSize(offering.getRootDiskSize());
+
         return offeringResponse;
     }
 
diff --git a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
@@ -190,6 +190,9 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
     @Column(name = "vsphere_storage_policy")
     String vsphereStoragePolicy;
 
+    @Column(name = "root_disk_size")
+    private Long rootDiskSize;
+
     public ServiceOfferingJoinVO() {
     }
 
@@ -363,7 +366,6 @@ public Long getIopsWriteRate() {
 
     public Long getIopsWriteRateMaxLength() { return iopsWriteRateMaxLength; }
 
-
     public boolean isDynamic() {
         return cpu == null || speed == null || ramSize == null;
     }
@@ -392,4 +394,7 @@ public String getVsphereStoragePolicy() {
         return vsphereStoragePolicy;
     }
 
+    public Long getRootDiskSize() {
+        return rootDiskSize ;
+    }
 }
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -432,6 +432,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
     private static final Set<Provider> VPC_ONLY_PROVIDERS = Sets.newHashSet(Provider.VPCVirtualRouter, Provider.JuniperContrailVpcRouter, Provider.InternalLbVm);
 
+    private static final long GiB_TO_BYTES = 1024 * 1024 * 1024;
+
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
         final String maxVolumeSizeInGbString = _configDao.getValue(Config.MaxVolumeSize.key());
@@ -2473,7 +2475,7 @@ public ServiceOffering createServiceOffering(final CreateServiceOfferingCmd cmd)
 
         return createServiceOffering(userId, cmd.isSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(),
                 cmd.getProvisioningType(), localStorageRequired, offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainIds(), cmd.getZoneIds(), cmd.getHostTag(),
-                cmd.getNetworkRate(), cmd.getDeploymentPlanner(), details, isCustomizedIops, cmd.getMinIops(), cmd.getMaxIops(),
+                cmd.getNetworkRate(), cmd.getDeploymentPlanner(), details, cmd.getRootDiskSize(), isCustomizedIops, cmd.getMinIops(), cmd.getMaxIops(),
                 cmd.getBytesReadRate(), cmd.getBytesReadRateMax(), cmd.getBytesReadRateMaxLength(),
                 cmd.getBytesWriteRate(), cmd.getBytesWriteRateMax(), cmd.getBytesWriteRateMaxLength(),
                 cmd.getIopsReadRate(), cmd.getIopsReadRateMax(), cmd.getIopsReadRateMaxLength(),
@@ -2484,7 +2486,7 @@ public ServiceOffering createServiceOffering(final CreateServiceOfferingCmd cmd)
     protected ServiceOfferingVO createServiceOffering(final long userId, final boolean isSystem, final VirtualMachine.Type vmType,
             final String name, final Integer cpu, final Integer ramSize, final Integer speed, final String displayText, final String provisioningType, final boolean localStorageRequired,
             final boolean offerHA, final boolean limitResourceUse, final boolean volatileVm, String tags, final List<Long> domainIds, List<Long> zoneIds, final String hostTag,
-            final Integer networkRate, final String deploymentPlanner, final Map<String, String> details, final Boolean isCustomizedIops, Long minIops, Long maxIops,
+            final Integer networkRate, final String deploymentPlanner, final Map<String, String> details, Long rootDiskSizeInGiB, final Boolean isCustomizedIops, Long minIops, Long maxIops,
             Long bytesReadRate, Long bytesReadRateMax, Long bytesReadRateMaxLength,
             Long bytesWriteRate, Long bytesWriteRateMax, Long bytesWriteRateMaxLength,
             Long iopsReadRate, Long iopsReadRateMax, Long iopsReadRateMaxLength,
@@ -2545,6 +2547,12 @@ protected ServiceOfferingVO createServiceOffering(final long userId, final boole
             }
         }
 
+        if (rootDiskSizeInGiB != null && rootDiskSizeInGiB <= 0L) {
+            throw new InvalidParameterValueException(String.format("The Root disk size is of %s GB but it must be greater than 0.", rootDiskSizeInGiB));
+        } else if (rootDiskSizeInGiB != null) {
+            long rootDiskSizeInBytes = rootDiskSizeInGiB * GiB_TO_BYTES;
+            offering.setDiskSize(rootDiskSizeInBytes);
+        }
 
         offering.setCustomizedIops(isCustomizedIops);
         offering.setMinIops(minIops);
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -894,7 +894,7 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
         DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId());
         DiskOfferingVO newDiskOffering = null;
 
-        if (cmd.getNewDiskOfferingId() != null && volume.getDiskOfferingId() != cmd.getNewDiskOfferingId()) {
+        if (cmd.getNewDiskOfferingId() != null) {
             newDiskOffering = _diskOfferingDao.findById(cmd.getNewDiskOfferingId());
         }
 
@@ -913,6 +913,12 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
 
         // if we are to use the existing disk offering
         if (newDiskOffering == null) {
+            if (volume.getVolumeType().equals(Volume.Type.ROOT) && diskOffering.getDiskSize() > 0) {
+                throw new InvalidParameterValueException(
+                        "Failed to resize Root volume. The service offering of this Volume has been configured with a root disk size; "
+                                + "on such case a Root Volume can only be resized when changing to another Service Offering with a Root disk size. "
+                                + "For more details please check out the Official Resizing Volumes documentation.");
+            }
             newSize = cmd.getSize();
             newHypervisorSnapshotReserve = volume.getHypervisorSnapshotReserve();
 
@@ -958,10 +964,6 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                 throw new InvalidParameterValueException("Requested disk offering has been removed.");
             }
 
-            if (!DiskOfferingVO.Type.Disk.equals(newDiskOffering.getType())) {
-                throw new InvalidParameterValueException("Requested disk offering type is invalid.");
-            }
-
             if (diskOffering.getTags() != null) {
                 if (!StringUtils.areTagsEqual(diskOffering.getTags(), newDiskOffering.getTags())) {
                     throw new InvalidParameterValueException("The tags on the new and old disk offerings must match.");
@@ -972,7 +974,9 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
 
             _configMgr.checkDiskOfferingAccess(_accountMgr.getActiveAccountById(volume.getAccountId()), newDiskOffering, _dcDao.findById(volume.getDataCenterId()));
 
-            if (newDiskOffering.isCustomized()) {
+            if (newDiskOffering.getDiskSize() > 0 && DiskOfferingVO.Type.Service.equals(newDiskOffering.getType())) {
+                newSize = newDiskOffering.getDiskSize();
+            } else if (newDiskOffering.isCustomized()) {
                 newSize = cmd.getSize();
 
                 if (newSize == null) {
@@ -989,9 +993,9 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                 newSize = newDiskOffering.getDiskSize();
             }
 
-            if (!volume.getSize().equals(newSize) && !volume.getVolumeType().equals(Volume.Type.DATADISK)) {
-                throw new InvalidParameterValueException("Only data volumes can be resized via a new disk offering.");
-            }
+            Long instanceId = volume.getInstanceId();
+            VMInstanceVO vmInstanceVO = _vmInstanceDao.findById(instanceId);
+            checkIfVolumeIsRootAndVmIsRunning(newSize, volume, vmInstanceVO);
 
             if (newDiskOffering.isCustomizedIops() != null && newDiskOffering.isCustomizedIops()) {
                 newMinIops = cmd.getMinIops() != null ? cmd.getMinIops() : volume.getMinIops();
@@ -1140,6 +1144,13 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                 shrinkOk);
     }
 
+    private void checkIfVolumeIsRootAndVmIsRunning(Long newSize, VolumeVO volume, VMInstanceVO vmInstanceVO) {
+        if (!volume.getSize().equals(newSize) && volume.getVolumeType().equals(Volume.Type.ROOT) && !State.Stopped.equals(vmInstanceVO.getState())) {
+            throw new InvalidParameterValueException(String.format("Cannot resize ROOT volume [%s] when VM is not on Stopped State. VM %s is in state %.", volume.getName(), vmInstanceVO
+                    .getInstanceName(), vmInstanceVO.getState()));
+        }
+    }
+
     private void validateIops(Long minIops, Long maxIops) {
         if ((minIops == null && maxIops != null) || (minIops != null && maxIops == null)) {
             throw new InvalidParameterValueException("Either 'miniops' and 'maxiops' must both be provided or neither must be provided.");
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,10 @@ public class ServiceOfferingResponse extends BaseResponse {`
`200`	`200`	`@Param(description = "the vsphere storage policy tagged to the service offering in case of VMware", since = "4.15")`
`201`	`201`	`private String vsphereStoragePolicy;`
`202`	`202`
	`203`	`+ @SerializedName(ApiConstants.ROOT_DISK_SIZE)`
	`204`	`+ @Param(description = "Root disk size in GB", since = "4.15")`
	`205`	`+ private Long rootDiskSize;`
	`206`	`+`
`203`	`207`	`public ServiceOfferingResponse() {`
`204`	`208`	`}`
`205`	`209`
`@@ -468,4 +472,7 @@ public void setVsphereStoragePolicy(String vsphereStoragePolicy) {`
`468`	`472`	`this.vsphereStoragePolicy = vsphereStoragePolicy;`
`469`	`473`	`}`
`470`	`474`
	`475`	`+ public void setRootDiskSize(Long rootDiskSize) {`
	`476`	`+ this.rootDiskSize = rootDiskSize;`
	`477`	`+ }`
`471`	`478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO`
`113`	`113`	`offeringResponse.setObjectName("serviceoffering");`
`114`	`114`	`offeringResponse.setIscutomized(offering.isDynamic());`
`115`	`115`	`offeringResponse.setCacheMode(offering.getCacheMode());`
	`116`	`+`
`116`	`117`	`if (offeringDetails != null && !offeringDetails.isEmpty()) {`
`117`	`118`	`String vsphereStoragePolicyId = offeringDetails.get(ApiConstants.STORAGE_POLICY);`
`118`	`119`	`if (vsphereStoragePolicyId != null) {`
`@@ -121,6 +122,9 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO`
`121`	`122`	`offeringResponse.setVsphereStoragePolicy(vsphereStoragePolicyVO.getName());`
`122`	`123`	`}`
`123`	`124`	`}`
	`125`	`+`
	`126`	`+ offeringResponse.setRootDiskSize(offering.getRootDiskSize());`
	`127`	`+`
`124`	`128`	`return offeringResponse;`
`125`	`129`	`}`
`126`	`130`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,9 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit`
`190`	`190`	`@Column(name = "vsphere_storage_policy")`
`191`	`191`	`String vsphereStoragePolicy;`
`192`	`192`
	`193`	`+ @Column(name = "root_disk_size")`
	`194`	`+ private Long rootDiskSize;`
	`195`	`+`
`193`	`196`	`public ServiceOfferingJoinVO() {`
`194`	`197`	`}`
`195`	`198`
`@@ -363,7 +366,6 @@ public Long getIopsWriteRate() {`
`363`	`366`
`364`	`367`	`public Long getIopsWriteRateMaxLength() { return iopsWriteRateMaxLength; }`
`365`	`368`
`366`		`-`
`367`	`369`	`public boolean isDynamic() {`
`368`	`370`	`return cpu == null \|\| speed == null \|\| ramSize == null;`
`369`	`371`	`}`
`@@ -392,4 +394,7 @@ public String getVsphereStoragePolicy() {`
`392`	`394`	`return vsphereStoragePolicy;`
`393`	`395`	`}`
`394`	`396`
	`397`	`+ public Long getRootDiskSize() {`
	`398`	`+ return rootDiskSize ;`
	`399`	`+ }`
`395`	`400`	`}`