You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2024/02/05 08:26:53 UTC
(cloudstack) 12/18: Renamed repair values
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch CheckVolumeAPI
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a47d50a225f03141815e0f098e0ac50a36e1c847
Author: Harikrishna Patnala <ha...@gmail.com>
AuthorDate: Tue Jan 30 12:44:16 2024 +0530
Renamed repair values
---
.../cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java | 6 +++---
.../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
index b47a42e028f..9e32aac7ae9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
@@ -61,7 +61,7 @@ public class CheckAndRepairVolumeCmd extends BaseCmd {
/////////////////////////////////////////////////////
public enum RepairValues {
- Leaks, All
+ LEAKS, ALL
}
public Long getId() {
@@ -70,12 +70,12 @@ public class CheckAndRepairVolumeCmd extends BaseCmd {
public String getRepair() {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(repair)) {
- RepairValues repairType = Enum.valueOf(RepairValues.class, repair);
+ RepairValues repairType = Enum.valueOf(RepairValues.class, repair.toUpperCase());
if (repairType == null) {
throw new InvalidParameterValueException(String.format("Repair parameter can only take the following values: %s" + Arrays.toString(RepairValues.values())));
}
}
- return repair;
+ return repair.toLowerCase();
}
/////////////////////////////////////////////////////
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index d765665a0ca..580e7207404 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -2770,7 +2770,7 @@ public class VolumeServiceImpl implements VolumeService {
if (HypervisorType.KVM.equals(host.getHypervisorType()) && DataObjectType.VOLUME.equals(dataObject.getType())) {
if (com.cloud.storage.VolumeApiServiceImpl.AllowCheckAndRepairVolume.value()) {
s_logger.info(String.format("Trying to check and repair the volume %d", dataObject.getId()));
- String repair = CheckAndRepairVolumeCmd.RepairValues.Leaks.name();
+ String repair = CheckAndRepairVolumeCmd.RepairValues.LEAKS.name().toLowerCase();
CheckAndRepairVolumePayload payload = new CheckAndRepairVolumePayload(repair);
VolumeInfo volumeInfo = volFactory.getVolume(dataObject.getId());
volumeInfo.addPayload(payload);