Skip to content

Commit baced22

Browse files
committed
rename getVolumePhysicalUsed to getVolumePhysicalSize
1 parent e07dcd6 commit baced22

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

api/src/main/java/com/cloud/storage/VolumeApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,5 +191,5 @@ Volume updateVolume(long volumeId, String path, String state, Long storageId,
191191

192192
Pair<String, String> checkAndRepairVolume(CheckAndRepairVolumeCmd cmd) throws ResourceAllocationException;
193193

194-
Long getVolumePhysicalUsed(Storage.ImageFormat format, String path, String chainInfo);
194+
Long getVolumePhysicalSize(Storage.ImageFormat format, String path, String chainInfo);
195195
}

api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public class BackupScheduleResponse extends BaseResponse {
3737
@Param(description = "ID of the VM")
3838
private String vmId;
3939

40-
@SerializedName("schedule")
40+
@SerializedName(ApiConstants.SCHEDULE)
4141
@Param(description = "time the backup is scheduled to be taken.")
4242
private String schedule;
4343

44-
@SerializedName("intervaltype")
44+
@SerializedName(ApiConstants.INTERVAL_TYPE)
4545
@Param(description = "the interval type of the backup schedule")
4646
private DateUtil.IntervalType intervalType;
4747

48-
@SerializedName("timezone")
48+
@SerializedName(ApiConstants.TIMEZONE)
4949
@Param(description = "the time zone of the backup schedule")
5050
private String timezone;
5151

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5157,7 +5157,7 @@ private VmWorkJobVO createPlaceHolderWork(long instanceId) {
51575157
}
51585158

51595159
@Override
5160-
public Long getVolumePhysicalUsed(ImageFormat format, String path, String chainInfo) {
5160+
public Long getVolumePhysicalSize(ImageFormat format, String path, String chainInfo) {
51615161
VolumeStats vs = null;
51625162
if (format == ImageFormat.VHD || format == ImageFormat.QCOW2 || format == ImageFormat.RAW) {
51635163
if (path != null) {

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ public boolean createBackup(final Long vmId, final Long scheduleId) throws Resou
585585
Long backupSize = 0L;
586586
for (final Volume volume: volumeDao.findByInstance(vmId)) {
587587
if (Volume.State.Ready.equals(volume.getState())) {
588-
Long volumeSize = volumeApiService.getVolumePhysicalUsed(volume.getFormat(), volume.getPath(), volume.getChainInfo());
588+
Long volumeSize = volumeApiService.getVolumePhysicalSize(volume.getFormat(), volume.getPath(), volume.getChainInfo());
589589
if (volumeSize == null) {
590590
volumeSize = volume.getSize();
591591
}

0 commit comments

Comments
 (0)