DaanHoogland commented on code in PR #6005:
URL: https://github.com/apache/cloudstack/pull/6005#discussion_r1059374000
##########
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java:
##########
@@ -377,7 +396,31 @@ public VolumeVO uploadVolume(UploadVolumeCmd cmd) throws
ResourceAllocationExcep
RegisterVolumePayload payload = new
RegisterVolumePayload(cmd.getUrl(), cmd.getChecksum(), format);
vol.addPayload(payload);
- volService.registerVolume(vol, store);
+ return registerVolume(vol, store, sizeInGB);
+ }
+
+ VolumeVO registerVolume(VolumeInfo vol, DataStore store, Long sizeInGB ) {
+ VolumeVO volume = _volsDao.findById(vol.getId());
+ try {
+ AsyncCallFuture<VolumeApiResult> future =
volService.registerVolume(vol, store);
+ VolumeApiResult result = future.get();
+ if (result.isFailed()) {
+ s_logger.warn("Failed to register the volume");
+ String details = "";
+ if (result.getResult() != null &&
!result.getResult().isEmpty()) {
+ details = result.getResult();
+ }
+ throw new CloudRuntimeException(details);
+ }
+ if (!Objects.equals(sizeInGB, vol.getSize())) {
+ if (sizeInGB !=null) {
+ volume.setSize(sizeInGB * GiB_TO_BYTES);
+ _volsDao.persist(volume);
+ }
+ }
Review Comment:
```suggestion
if (! (sizeInGB ==null || Objects.equals(sizeInGB,
vol.getSize())) {
volume.setSize(sizeInGB * GiB_TO_BYTES);
_volsDao.persist(volume);
}
```
--
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]
