Skip to content

Commit a5be3ef

Browse files
winterhazelwinterhazel
committed
Fix Usage inconsistencies
1 parent 46201ee commit a5be3ef

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

‎engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworksDaoImpl.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// under the License.
1717
package com.cloud.usage.dao;
1818

19-
import com.cloud.network.Network;
2019
import com.cloud.usage.UsageNetworksVO;
2120
import com.cloud.utils.DateUtil;
2221
import com.cloud.utils.db.GenericDaoBase;
@@ -70,11 +69,10 @@ public void remove(long networkId, Date removed) {
7069
SearchCriteria<UsageNetworksVO> sc = this.createSearchCriteria();
7170
sc.addAnd("networkId", SearchCriteria.Op.EQ, networkId);
7271
sc.addAnd("removed", SearchCriteria.Op.NULL);
73-
UsageNetworksVO vo = findOneBy(sc);
74-
if (vo != null) {
75-
vo.setRemoved(removed);
76-
vo.setState(Network.State.Destroy.name());
77-
update(vo.getId(), vo);
72+
List<UsageNetworksVO> usageNetworksVOs = listBy(sc);
73+
for (UsageNetworksVO entry : usageNetworksVOs) {
74+
entry.setRemoved(removed);
75+
update(entry.getId(), entry);
7876
}
7977
} catch (final Exception e) {
8078
txn.rollback();

‎engine/schema/src/main/java/com/cloud/usage/dao/UsageVpcDaoImpl.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// under the License.
1717
package com.cloud.usage.dao;
1818

19-
import com.cloud.network.vpc.Vpc;
2019
import com.cloud.usage.UsageVpcVO;
2120
import com.cloud.utils.DateUtil;
2221
import com.cloud.utils.db.GenericDaoBase;
@@ -64,11 +63,10 @@ public void remove(long vpcId, Date removed) {
6463
SearchCriteria<UsageVpcVO> sc = this.createSearchCriteria();
6564
sc.addAnd("vpcId", SearchCriteria.Op.EQ, vpcId);
6665
sc.addAnd("removed", SearchCriteria.Op.NULL);
67-
UsageVpcVO vo = findOneBy(sc);
68-
if (vo != null) {
69-
vo.setRemoved(removed);
70-
vo.setState(Vpc.State.Inactive.name());
71-
update(vo.getId(), vo);
66+
List<UsageVpcVO> usageVpcVOs = listBy(sc);
67+
for (UsageVpcVO entry : usageVpcVOs) {
68+
entry.setRemoved(removed);
69+
update(entry.getId(), entry);
7270
}
7371
} catch (final Exception e) {
7472
txn.rollback();

‎usage/src/main/java/com/cloud/usage/UsageManagerImpl.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ private void createVolumeHelperEvent(UsageEventVO event) {
15441544
//For volumes which are 'attached' successfully, set the 'deleted' column in the usage_storage table,
15451545
//so that the secondary storage should stop accounting and only primary will be accounted.
15461546
SearchCriteria<UsageStorageVO> sc = _usageStorageDao.createSearchCriteria();
1547-
sc.addAnd("id", SearchCriteria.Op.EQ, volId);
1547+
sc.addAnd("entityId", SearchCriteria.Op.EQ, volId);
15481548
sc.addAnd("storageType", SearchCriteria.Op.EQ, StorageTypes.VOLUME);
15491549
List<UsageStorageVO> volumesVOs = _usageStorageDao.search(sc, null);
15501550
if (volumesVOs != null) {
@@ -1599,7 +1599,8 @@ private void createVolumeHelperEvent(UsageEventVO event) {
15991599
//For Upload event add an entry to the usage_storage table.
16001600
SearchCriteria<UsageStorageVO> sc = _usageStorageDao.createSearchCriteria();
16011601
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
1602-
sc.addAnd("id", SearchCriteria.Op.EQ, volId);
1602+
sc.addAnd("entityId", SearchCriteria.Op.EQ, volId);
1603+
sc.addAnd("storageType", SearchCriteria.Op.EQ, StorageTypes.VOLUME);
16031604
sc.addAnd("deleted", SearchCriteria.Op.NULL);
16041605
List<UsageStorageVO> volumesVOs = _usageStorageDao.search(sc, null);
16051606

@@ -1776,7 +1777,7 @@ private void createLoadBalancerHelperEvent(UsageEventVO event) {
17761777
} else if (EventTypes.EVENT_LOAD_BALANCER_DELETE.equals(event.getType())) {
17771778
SearchCriteria<UsageLoadBalancerPolicyVO> sc = _usageLoadBalancerPolicyDao.createSearchCriteria();
17781779
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
1779-
sc.addAnd("id", SearchCriteria.Op.EQ, id);
1780+
sc.addAnd("lbId", SearchCriteria.Op.EQ, id);
17801781
sc.addAnd("deleted", SearchCriteria.Op.NULL);
17811782
List<UsageLoadBalancerPolicyVO> lbVOs = _usageLoadBalancerPolicyDao.search(sc, null);
17821783
if (lbVOs.size() > 1) {
@@ -1810,7 +1811,7 @@ private void createPortForwardingHelperEvent(UsageEventVO event) {
18101811
} else if (EventTypes.EVENT_NET_RULE_DELETE.equals(event.getType())) {
18111812
SearchCriteria<UsagePortForwardingRuleVO> sc = _usagePortForwardingRuleDao.createSearchCriteria();
18121813
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
1813-
sc.addAnd("id", SearchCriteria.Op.EQ, id);
1814+
sc.addAnd("pfId", SearchCriteria.Op.EQ, id);
18141815
sc.addAnd("deleted", SearchCriteria.Op.NULL);
18151816
List<UsagePortForwardingRuleVO> pfVOs = _usagePortForwardingRuleDao.search(sc, null);
18161817
if (pfVOs.size() > 1) {
@@ -2111,7 +2112,7 @@ private void createVmSnapshotOnPrimaryEvent(UsageEventVO event) {
21112112
} else if (EventTypes.EVENT_VM_SNAPSHOT_OFF_PRIMARY.equals(event.getType())) {
21122113
QueryBuilder<UsageSnapshotOnPrimaryVO> sc = QueryBuilder.create(UsageSnapshotOnPrimaryVO.class);
21132114
sc.and(sc.entity().getAccountId(), SearchCriteria.Op.EQ, event.getAccountId());
2114-
sc.and(sc.entity().getId(), SearchCriteria.Op.EQ, vmId);
2115+
sc.and(sc.entity().getVmId(), SearchCriteria.Op.EQ, vmId);
21152116
sc.and(sc.entity().getName(), SearchCriteria.Op.EQ, name);
21162117
sc.and(sc.entity().getDeleted(), SearchCriteria.Op.NULL);
21172118
List<UsageSnapshotOnPrimaryVO> vmsnaps = sc.list();
@@ -2154,6 +2155,9 @@ private void handleNetworkEvent(UsageEventVO event) {
21542155
if (EventTypes.EVENT_NETWORK_DELETE.equals(event.getType())) {
21552156
usageNetworksDao.remove(event.getResourceId(), event.getCreateDate());
21562157
} else if (EventTypes.EVENT_NETWORK_CREATE.equals(event.getType())) {
2158+
logger.debug("Marking existing helper entries for network [{}] as removed.", event.getResourceId());
2159+
usageNetworksDao.remove(event.getResourceId(), event.getCreateDate());
2160+
logger.debug("Creating a helper entry for network [{}].", event.getResourceId());
21572161
UsageNetworksVO usageNetworksVO = new UsageNetworksVO(event.getResourceId(), event.getOfferingId(), event.getZoneId(), event.getAccountId(), domainId, Network.State.Allocated.name(), event.getCreateDate(), null);
21582162
usageNetworksDao.persist(usageNetworksVO);
21592163
} else if (EventTypes.EVENT_NETWORK_UPDATE.equals(event.getType())) {
@@ -2169,10 +2173,13 @@ private void handleVpcEvent(UsageEventVO event) {
21692173
if (EventTypes.EVENT_VPC_DELETE.equals(event.getType())) {
21702174
usageVpcDao.remove(event.getResourceId(), event.getCreateDate());
21712175
} else if (EventTypes.EVENT_VPC_CREATE.equals(event.getType())) {
2176+
logger.debug("Marking existing helper entries for VPC [{}] as removed.", event.getResourceId());
2177+
usageVpcDao.remove(event.getResourceId(), event.getCreateDate());
2178+
logger.debug("Creating a helper entry for VPC [{}].", event.getResourceId());
21722179
UsageVpcVO usageVPCVO = new UsageVpcVO(event.getResourceId(), event.getZoneId(), event.getAccountId(), domainId, Vpc.State.Enabled.name(), event.getCreateDate(), null);
21732180
usageVpcDao.persist(usageVPCVO);
21742181
} else {
2175-
logger.error(String.format("Unknown event type [%s] in VPC event parser. Skipping it.", event.getType()));
2182+
logger.error("Unknown event type [{}] in VPC event parser. Skipping it.", event.getType());
21762183
}
21772184
}
21782185

0 commit comments

Comments
 (0)