You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jo...@apache.org on 2025/02/19 11:44:32 UTC
(cloudstack) branch 4.20 updated: Fix Usage inconsistencies (#9888)
This is an automated email from the ASF dual-hosted git repository.
joao pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.20 by this push:
new c0e05c4a6d7 Fix Usage inconsistencies (#9888)
c0e05c4a6d7 is described below
commit c0e05c4a6d7fb0cc429a5ee6433b928ebbed043e
Author: Fabricio Duarte <fa...@gmail.com>
AuthorDate: Wed Feb 19 08:44:26 2025 -0300
Fix Usage inconsistencies (#9888)
---
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 10 ++++------
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 10 ++++------
.../main/java/com/cloud/usage/UsageManagerImpl.java | 19 +++++++++++++------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java
index f8ffbf74f85..99ba3587688 100644
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.usage.dao;
-import com.cloud.network.Network;
import com.cloud.usage.UsageNetworksVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
@@ -70,11 +69,10 @@ public class UsageNetworksDaoImpl extends GenericDaoBase<UsageNetworksVO, Long>
SearchCriteria<UsageNetworksVO> sc = this.createSearchCriteria();
sc.addAnd("networkId", SearchCriteria.Op.EQ, networkId);
sc.addAnd("removed", SearchCriteria.Op.NULL);
- UsageNetworksVO vo = findOneBy(sc);
- if (vo != null) {
- vo.setRemoved(removed);
- vo.setState(Network.State.Destroy.name());
- update(vo.getId(), vo);
+ List<UsageNetworksVO> usageNetworksVOs = listBy(sc);
+ for (UsageNetworksVO entry : usageNetworksVOs) {
+ entry.setRemoved(removed);
+ update(entry.getId(), entry);
}
} catch (final Exception e) {
txn.rollback();
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java
index 45ae845e58f..70cdadd1629 100644
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.usage.dao;
-import com.cloud.network.vpc.Vpc;
import com.cloud.usage.UsageVpcVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
@@ -64,11 +63,10 @@ public class UsageVpcDaoImpl extends GenericDaoBase<UsageVpcVO, Long> implements
SearchCriteria<UsageVpcVO> sc = this.createSearchCriteria();
sc.addAnd("vpcId", SearchCriteria.Op.EQ, vpcId);
sc.addAnd("removed", SearchCriteria.Op.NULL);
- UsageVpcVO vo = findOneBy(sc);
- if (vo != null) {
- vo.setRemoved(removed);
- vo.setState(Vpc.State.Inactive.name());
- update(vo.getId(), vo);
+ List<UsageVpcVO> usageVpcVOs = listBy(sc);
+ for (UsageVpcVO entry : usageVpcVOs) {
+ entry.setRemoved(removed);
+ update(entry.getId(), entry);
}
} catch (final Exception e) {
txn.rollback();
diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
index b9b32e7ff9b..9be7c0538b7 100644
--- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -1544,7 +1544,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
//For volumes which are 'attached' successfully, set the 'deleted' column in the usage_storage table,
//so that the secondary storage should stop accounting and only primary will be accounted.
SearchCriteria<UsageStorageVO> sc = _usageStorageDao.createSearchCriteria();
- sc.addAnd("id", SearchCriteria.Op.EQ, volId);
+ sc.addAnd("entityId", SearchCriteria.Op.EQ, volId);
sc.addAnd("storageType", SearchCriteria.Op.EQ, StorageTypes.VOLUME);
List<UsageStorageVO> volumesVOs = _usageStorageDao.search(sc, null);
if (volumesVOs != null) {
@@ -1599,7 +1599,8 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
//For Upload event add an entry to the usage_storage table.
SearchCriteria<UsageStorageVO> sc = _usageStorageDao.createSearchCriteria();
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
- sc.addAnd("id", SearchCriteria.Op.EQ, volId);
+ sc.addAnd("entityId", SearchCriteria.Op.EQ, volId);
+ sc.addAnd("storageType", SearchCriteria.Op.EQ, StorageTypes.VOLUME);
sc.addAnd("deleted", SearchCriteria.Op.NULL);
List<UsageStorageVO> volumesVOs = _usageStorageDao.search(sc, null);
@@ -1776,7 +1777,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
} else if (EventTypes.EVENT_LOAD_BALANCER_DELETE.equals(event.getType())) {
SearchCriteria<UsageLoadBalancerPolicyVO> sc = _usageLoadBalancerPolicyDao.createSearchCriteria();
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
- sc.addAnd("id", SearchCriteria.Op.EQ, id);
+ sc.addAnd("lbId", SearchCriteria.Op.EQ, id);
sc.addAnd("deleted", SearchCriteria.Op.NULL);
List<UsageLoadBalancerPolicyVO> lbVOs = _usageLoadBalancerPolicyDao.search(sc, null);
if (lbVOs.size() > 1) {
@@ -1810,7 +1811,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
} else if (EventTypes.EVENT_NET_RULE_DELETE.equals(event.getType())) {
SearchCriteria<UsagePortForwardingRuleVO> sc = _usagePortForwardingRuleDao.createSearchCriteria();
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
- sc.addAnd("id", SearchCriteria.Op.EQ, id);
+ sc.addAnd("pfId", SearchCriteria.Op.EQ, id);
sc.addAnd("deleted", SearchCriteria.Op.NULL);
List<UsagePortForwardingRuleVO> pfVOs = _usagePortForwardingRuleDao.search(sc, null);
if (pfVOs.size() > 1) {
@@ -2111,7 +2112,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
} else if (EventTypes.EVENT_VM_SNAPSHOT_OFF_PRIMARY.equals(event.getType())) {
QueryBuilder<UsageSnapshotOnPrimaryVO> sc = QueryBuilder.create(UsageSnapshotOnPrimaryVO.class);
sc.and(sc.entity().getAccountId(), SearchCriteria.Op.EQ, event.getAccountId());
- sc.and(sc.entity().getId(), SearchCriteria.Op.EQ, vmId);
+ sc.and(sc.entity().getVmId(), SearchCriteria.Op.EQ, vmId);
sc.and(sc.entity().getName(), SearchCriteria.Op.EQ, name);
sc.and(sc.entity().getDeleted(), SearchCriteria.Op.NULL);
List<UsageSnapshotOnPrimaryVO> vmsnaps = sc.list();
@@ -2154,6 +2155,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
if (EventTypes.EVENT_NETWORK_DELETE.equals(event.getType())) {
usageNetworksDao.remove(event.getResourceId(), event.getCreateDate());
} else if (EventTypes.EVENT_NETWORK_CREATE.equals(event.getType())) {
+ logger.debug("Marking existing helper entries for network [{}] as removed.", event.getResourceId());
+ usageNetworksDao.remove(event.getResourceId(), event.getCreateDate());
+ logger.debug("Creating a helper entry for network [{}].", event.getResourceId());
UsageNetworksVO usageNetworksVO = new UsageNetworksVO(event.getResourceId(), event.getOfferingId(), event.getZoneId(), event.getAccountId(), domainId, Network.State.Allocated.name(), event.getCreateDate(), null);
usageNetworksDao.persist(usageNetworksVO);
} else if (EventTypes.EVENT_NETWORK_UPDATE.equals(event.getType())) {
@@ -2169,10 +2173,13 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
if (EventTypes.EVENT_VPC_DELETE.equals(event.getType())) {
usageVpcDao.remove(event.getResourceId(), event.getCreateDate());
} else if (EventTypes.EVENT_VPC_CREATE.equals(event.getType())) {
+ logger.debug("Marking existing helper entries for VPC [{}] as removed.", event.getResourceId());
+ usageVpcDao.remove(event.getResourceId(), event.getCreateDate());
+ logger.debug("Creating a helper entry for VPC [{}].", event.getResourceId());
UsageVpcVO usageVPCVO = new UsageVpcVO(event.getResourceId(), event.getZoneId(), event.getAccountId(), domainId, Vpc.State.Enabled.name(), event.getCreateDate(), null);
usageVpcDao.persist(usageVPCVO);
} else {
- logger.error(String.format("Unknown event type [%s] in VPC event parser. Skipping it.", event.getType()));
+ logger.error("Unknown event type [{}] in VPC event parser. Skipping it.", event.getType());
}
}