From 1efa46cb4d1d9571b2e3138be0565ea25a70787d Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Thu, 2 Oct 2025 17:15:54 +0530
Subject: [PATCH] fix removeUsage for backups (#11522)

---
 .../main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java   | 2 +-
 .../org/apache/cloudstack/backup/BackupManagerImpl.java     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java
index e5b46b02a59..3f852b0cfb5 100644
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java
@@ -68,7 +68,7 @@ public class UsageBackupDaoImpl extends GenericDaoBase<UsageBackupVO, Long> impl
                     pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), eventDate));
                     pstmt.setLong(2, accountId);
                     pstmt.setLong(3, vmId);
-                    pstmt.setLong(3, backupOfferingId);
+                    pstmt.setLong(4, backupOfferingId);
                     pstmt.executeUpdate();
                 }
             } catch (SQLException e) {
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index bb3e3f2409f..aff838a3cdf 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1927,7 +1927,11 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
             for (final VirtualMachine vm : vms) {
 
                 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 backupProtectedSize = 0L;
                     if (Objects.nonNull(backup.getSize())) {