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

fix removeUsage for backups (#11522)

Browse Source
This commit is contained in:
Abhisar Sinha 2025-10-02 17:15:54 +05:30 committed by GitHub
parent cd12fa5848
commit 1efa46cb4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ public class UsageBackupDaoImpl extends GenericDaoBase<UsageBackupVO, Long> impl
pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), eventDate)); pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), eventDate));
pstmt.setLong(2, accountId); pstmt.setLong(2, accountId);
pstmt.setLong(3, vmId); pstmt.setLong(3, vmId);
pstmt.setLong(3, backupOfferingId); pstmt.setLong(4, backupOfferingId);
pstmt.executeUpdate(); pstmt.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {

6
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View File

@ -1927,7 +1927,11 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
for (final VirtualMachine vm : vms) { for (final VirtualMachine vm : vms) {
Map<Long, Pair<Long, Long>> backupOfferingToSizeMap = new HashMap<>(); Map<Long, Pair<Long, Long>> backupOfferingToSizeMap = new HashMap<>();
for (final Backup backup: backupDao.listByVmId(null, vm.getId())) { List<Backup> backups = backupDao.listByVmId(null, vm.getId());
if (backups.isEmpty() && vm.getBackupOfferingId() != null) {
backupOfferingToSizeMap.put(vm.getBackupOfferingId(), new Pair<>(0L, 0L));
}
for (final Backup backup: backups) {
Long backupSize = 0L; Long backupSize = 0L;
Long backupProtectedSize = 0L; Long backupProtectedSize = 0L;
if (Objects.nonNull(backup.getSize())) { if (Objects.nonNull(backup.getSize())) {