CLOUDSTACK-8166: add boundary checks in various usage parsers

yadvr · yadvr · commit a52bbfb2ccaa · 2015-01-18T17:15:48.000+05:30
- Add boundary condition to continue looping if creation data is after end date - Add null pointer fix for create snapshot bug Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> (cherry picked from commit 065c556) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -1729,7 +1729,7 @@ private void createVMSnapshotEvent(UsageEventVO event) {
         Long offeringId = event.getOfferingId();
         Long zoneId = event.getZoneId();
         Long accountId = event.getAccountId();
-        long size = event.getSize();
+        long size = event.getSize() == null ? 0L : event.getSize().longValue();
         Date created = event.getCreateDate();
         Account acct = _accountDao.findByIdIncludingRemoved(event.getAccountId());
         Long domainId = acct.getDomainId();
diff --git a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java b/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java
@@ -101,6 +101,11 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 IpAssignDate = startDate;
             }
 
+            // ignore if assign date is after end date
+            if (IpAssignDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (IpReleaseDeleteDate.getTime() - IpAssignDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateIpUsageData(usageMap, key, usageIp.getId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java b/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java
@@ -98,6 +98,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 lbCreateDate = startDate;
             }
 
+            if (lbCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (lbDeleteDate.getTime() - lbCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateLBUsageData(usageMap, key, usageLB.getId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java
@@ -99,6 +99,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 noCreateDate = startDate;
             }
 
+            if (noCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (noDeleteDate.getTime() - noCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateNOUsageData(usageMap, key, usageNO.getVmInstanceId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java b/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java
@@ -98,6 +98,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 pfCreateDate = startDate;
             }
 
+            if (pfCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (pfDeleteDate.getTime() - pfCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updatePFUsageData(usageMap, key, usagePF.getId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java b/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java
@@ -99,6 +99,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 sgCreateDate = startDate;
             }
 
+            if (sgCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (sgDeleteDate.getTime() - sgCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateSGUsageData(usageMap, key, usageSG.getVmInstanceId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/StorageUsageParser.java b/usage/src/com/cloud/usage/parser/StorageUsageParser.java
@@ -107,6 +107,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 storageCreateDate = startDate;
             }
 
+            if (storageCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (storageDeleteDate.getTime() - storageCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateStorageUsageData(usageMap, key, usageStorage.getId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java b/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java
@@ -104,6 +104,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 vmStartDate = startDate;
             }
 
+            if (vmStartDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (vmEndDate.getTime() - vmStartDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             switch (usageType) {
diff --git a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java b/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java
@@ -94,6 +94,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 vuCreateDate = startDate;
             }
 
+            if (vuCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (vuDeleteDate.getTime() - vuCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateVUUsageData(usageMap, key, usageVU.getUserId(), currentDuration);
diff --git a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
@@ -103,6 +103,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
                 volCreateDate = startDate;
             }
 
+            if (volCreateDate.after(endDate)) {
+                continue;
+            }
+
             long currentDuration = (volDeleteDate.getTime() - volCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
             updateVolUsageData(usageMap, key, usageVol.getId(), currentDuration);

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`98`	`98`	`lbCreateDate = startDate;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ if (lbCreateDate.after(endDate)) {`
	`102`	`+ continue;`
	`103`	`+ }`
	`104`	`+`
`101`	`105`	`long currentDuration = (lbDeleteDate.getTime() - lbCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`102`	`106`
`103`	`107`	`updateLBUsageData(usageMap, key, usageLB.getId(), currentDuration);`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`99`	`99`	`noCreateDate = startDate;`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ if (noCreateDate.after(endDate)) {`
	`103`	`+ continue;`
	`104`	`+ }`
	`105`	`+`
`102`	`106`	`long currentDuration = (noDeleteDate.getTime() - noCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`103`	`107`
`104`	`108`	`updateNOUsageData(usageMap, key, usageNO.getVmInstanceId(), currentDuration);`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`107`	`107`	`storageCreateDate = startDate;`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ if (storageCreateDate.after(endDate)) {`
	`111`	`+ continue;`
	`112`	`+ }`
	`113`	`+`
`110`	`114`	`long currentDuration = (storageDeleteDate.getTime() - storageCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`111`	`115`
`112`	`116`	`updateStorageUsageData(usageMap, key, usageStorage.getId(), currentDuration);`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`104`	`104`	`vmStartDate = startDate;`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ if (vmStartDate.after(endDate)) {`
	`108`	`+ continue;`
	`109`	`+ }`
	`110`	`+`
`107`	`111`	`long currentDuration = (vmEndDate.getTime() - vmStartDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`108`	`112`
`109`	`113`	`switch (usageType) {`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`94`	`94`	`vuCreateDate = startDate;`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ if (vuCreateDate.after(endDate)) {`
	`98`	`+ continue;`
	`99`	`+ }`
	`100`	`+`
`97`	`101`	`long currentDuration = (vuDeleteDate.getTime() - vuCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`98`	`102`
`99`	`103`	`updateVUUsageData(usageMap, key, usageVU.getUserId(), currentDuration);`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,10 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {`
`103`	`103`	`volCreateDate = startDate;`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ if (volCreateDate.after(endDate)) {`
	`107`	`+ continue;`
	`108`	`+ }`
	`109`	`+`
`106`	`110`	`long currentDuration = (volDeleteDate.getTime() - volCreateDate.getTime()) + 1; // make sure this is an inclusive check for milliseconds (i.e. use n - m + 1 to find total number of millis to charge)`
`107`	`111`
`108`	`112`	`updateVolUsageData(usageMap, key, usageVol.getId(), currentDuration);`