From 90b5841275e7d46a098787a2210c9eb2c2f6e045 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 14 Sep 2022 10:26:48 +0200 Subject: [PATCH] fix usage charging for deleted/resized volumes --- usage/src/main/java/com/cloud/usage/UsageManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java index c8d296cf8df9..cb9b572373b4 100644 --- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java @@ -1458,7 +1458,7 @@ private void createVolumeHelperEvent(UsageEventVO event) { if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType()) || EventTypes.EVENT_VOLUME_RESIZE.equals(event.getType())) { SearchCriteria sc = _usageVolumeDao.createSearchCriteria(); sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId()); - sc.addAnd("id", SearchCriteria.Op.EQ, volId); + sc.addAnd("volumeId", SearchCriteria.Op.EQ, volId); sc.addAnd("deleted", SearchCriteria.Op.NULL); List volumesVOs = _usageVolumeDao.search(sc, null); if (volumesVOs.size() > 0) { @@ -1482,7 +1482,7 @@ private void createVolumeHelperEvent(UsageEventVO event) { } else if (EventTypes.EVENT_VOLUME_DELETE.equals(event.getType())) { SearchCriteria sc = _usageVolumeDao.createSearchCriteria(); sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId()); - sc.addAnd("id", SearchCriteria.Op.EQ, volId); + sc.addAnd("volumeId", SearchCriteria.Op.EQ, volId); sc.addAnd("deleted", SearchCriteria.Op.NULL); List volumesVOs = _usageVolumeDao.search(sc, null); if (volumesVOs.size() > 1) {