[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.15' into main

[da...@apache.org]

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

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

commit 37f3fc30c99152cc821a8d83215a28a59897a4dd
Merge: 3c1219a 446337b
Author: davidjumani <dj...@gmail.com>
AuthorDate: Tue Jul 27 10:23:00 2021 +0530

    Merge remote-tracking branch 'apache/4.15' into main

 .../src/main/java/com/cloud/storage/VolumeApiServiceImpl.java  | 10 +---------
 ui/src/views/infra/HostInfo.vue                                |  8 ++++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --cc server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 3c6460b,9791267..df09648
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@@ -1374,8 -1313,9 +1366,8 @@@ public class VolumeApiServiceImpl exten
                      volume.getDiskOfferingId(), volume.getTemplateId(), volume.getSize(), Volume.class.getName(), volume.getUuid());
  
              return volume;
 -
          } catch (Exception e) {
-             throw new CloudRuntimeException("Couldn't resize volume: " + volume.getName() + ", " + e.getMessage(), e);
+             throw new CloudRuntimeException(String.format("Failed to resize volume operation of volume UUID: [%s] due to - %s", volume.getUuid(), e.getMessage()), e);
          }
      }