apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

used volume name in logs

Browse Source
This commit is contained in:
Harikrishna Patnala 2024-02-01 13:13:23 +05:30
parent 61a63a9307
commit e67c43497e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
View File

@ -74,8 +74,9 @@ public class CheckAndRepairVolumeCmd extends BaseCmd {
if (repairType == null) { if (repairType == null) {
throw new InvalidParameterValueException(String.format("Repair parameter can only take the following values: %s" + Arrays.toString(RepairValues.values()))); throw new InvalidParameterValueException(String.format("Repair parameter can only take the following values: %s" + Arrays.toString(RepairValues.values())));
} }
return repair.toLowerCase();
} }
return repair.toLowerCase(); return null;
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////

12
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -1895,14 +1895,14 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
Account caller = CallContext.current().getCallingAccount(); Account caller = CallContext.current().getCallingAccount();
_accountMgr.checkAccess(caller, null, true, volume); _accountMgr.checkAccess(caller, null, true, volume);
Long volumeId = volume.getId(); String volumeName = volume.getName();
Long vmId = volume.getInstanceId(); Long vmId = volume.getInstanceId();
if (vmId != null) { if (vmId != null) {
validateVMforCheckVolumeOperation(vmId, volumeId); validateVMforCheckVolumeOperation(vmId, volumeName);
} }
if (volume.getState() != Volume.State.Ready) { if (volume.getState() != Volume.State.Ready) {
throw new InvalidParameterValueException(String.format("VolumeId: %d is not in Ready state", volumeId)); throw new InvalidParameterValueException(String.format("Volume: %s is not in Ready state", volumeName));
} }
HypervisorType hypervisorType = _volsDao.getHypervisorType(volume.getId()); HypervisorType hypervisorType = _volsDao.getHypervisorType(volume.getId());
@ -1911,17 +1911,17 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
} }
} }
private void validateVMforCheckVolumeOperation(Long vmId, Long volumeId) { private void validateVMforCheckVolumeOperation(Long vmId, String volumeName) {
Account caller = CallContext.current().getCallingAccount(); Account caller = CallContext.current().getCallingAccount();
UserVmVO vm = _userVmDao.findById(vmId); UserVmVO vm = _userVmDao.findById(vmId);
if (vm == null) { if (vm == null) {
throw new InvalidParameterValueException(String.format("VM not found, please check the VM to which this volume %d is attached", volumeId)); throw new InvalidParameterValueException(String.format("VM not found, please check the VM to which this volume %s is attached", volumeName));
} }
_accountMgr.checkAccess(caller, null, true, vm); _accountMgr.checkAccess(caller, null, true, vm);
if (vm.getState() != State.Stopped) { if (vm.getState() != State.Stopped) {
throw new InvalidParameterValueException(String.format("VM to which the volume %d is attached should be in stopped state", volumeId)); throw new InvalidParameterValueException(String.format("VM to which the volume %s is attached should be in stopped state", volumeName));
} }
} }