Skip to content

Commit 1efa46c

Browse files
authored
fix removeUsage for backups (#11522)
1 parent cd12fa5 commit 1efa46c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void removeUsage(Long accountId, Long vmId, Long backupOfferingId, Date e
6868
pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), eventDate));
6969
pstmt.setLong(2, accountId);
7070
pstmt.setLong(3, vmId);
71-
pstmt.setLong(3, backupOfferingId);
71+
pstmt.setLong(4, backupOfferingId);
7272
pstmt.executeUpdate();
7373
}
7474
} catch (SQLException e) {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,11 @@ private void updateBackupUsageRecords(final BackupProvider backupProvider, DataC
19271927
for (final VirtualMachine vm : vms) {
19281928

19291929
Map<Long, Pair<Long, Long>> backupOfferingToSizeMap = new HashMap<>();
1930-
for (final Backup backup: backupDao.listByVmId(null, vm.getId())) {
1930+
List<Backup> backups = backupDao.listByVmId(null, vm.getId());
1931+
if (backups.isEmpty() && vm.getBackupOfferingId() != null) {
1932+
backupOfferingToSizeMap.put(vm.getBackupOfferingId(), new Pair<>(0L, 0L));
1933+
}
1934+
for (final Backup backup: backups) {
19311935
Long backupSize = 0L;
19321936
Long backupProtectedSize = 0L;
19331937
if (Objects.nonNull(backup.getSize())) {

0 commit comments

Comments
 (0)