|
32 | 32 |
|
33 | 33 | import javax.inject.Inject; |
34 | 34 | import javax.naming.ConfigurationException; |
| 35 | +import javax.persistence.EntityExistsException; |
35 | 36 |
|
36 | 37 | import org.apache.cloudstack.quota.QuotaAlertManager; |
37 | 38 | import org.apache.cloudstack.quota.QuotaManager; |
@@ -983,34 +984,38 @@ private boolean parseHelperTables(AccountVO account, Date currentStartDate, Date |
983 | 984 |
|
984 | 985 | private void createHelperRecord(UsageEventVO event) { |
985 | 986 | String eventType = event.getType(); |
986 | | - if (isVMEvent(eventType)) { |
987 | | - createVMHelperEvent(event); |
988 | | - } else if (isIPEvent(eventType)) { |
989 | | - createIPHelperEvent(event); |
990 | | - } else if (isVolumeEvent(eventType)) { |
991 | | - createVolumeHelperEvent(event); |
992 | | - } else if (isTemplateEvent(eventType)) { |
993 | | - createTemplateHelperEvent(event); |
994 | | - } else if (isISOEvent(eventType)) { |
995 | | - createISOHelperEvent(event); |
996 | | - } else if (isSnapshotEvent(eventType)) { |
997 | | - createSnapshotHelperEvent(event); |
998 | | - } else if (isLoadBalancerEvent(eventType)) { |
999 | | - createLoadBalancerHelperEvent(event); |
1000 | | - } else if (isPortForwardingEvent(eventType)) { |
1001 | | - createPortForwardingHelperEvent(event); |
1002 | | - } else if (isNetworkOfferingEvent(eventType)) { |
1003 | | - createNetworkOfferingEvent(event); |
1004 | | - } else if (isVPNUserEvent(eventType)) { |
1005 | | - handleVpnUserEvent(event); |
1006 | | - } else if (isSecurityGroupEvent(eventType)) { |
1007 | | - createSecurityGroupEvent(event); |
1008 | | - } else if (isVmSnapshotEvent(eventType)) { |
1009 | | - handleVMSnapshotEvent(event); |
1010 | | - } else if (isVmSnapshotOnPrimaryEvent(eventType)) { |
1011 | | - createVmSnapshotOnPrimaryEvent(event); |
1012 | | - } else if (isBackupEvent(eventType)) { |
1013 | | - createBackupEvent(event); |
| 987 | + try { |
| 988 | + if (isVMEvent(eventType)) { |
| 989 | + createVMHelperEvent(event); |
| 990 | + } else if (isIPEvent(eventType)) { |
| 991 | + createIPHelperEvent(event); |
| 992 | + } else if (isVolumeEvent(eventType)) { |
| 993 | + createVolumeHelperEvent(event); |
| 994 | + } else if (isTemplateEvent(eventType)) { |
| 995 | + createTemplateHelperEvent(event); |
| 996 | + } else if (isISOEvent(eventType)) { |
| 997 | + createISOHelperEvent(event); |
| 998 | + } else if (isSnapshotEvent(eventType)) { |
| 999 | + createSnapshotHelperEvent(event); |
| 1000 | + } else if (isLoadBalancerEvent(eventType)) { |
| 1001 | + createLoadBalancerHelperEvent(event); |
| 1002 | + } else if (isPortForwardingEvent(eventType)) { |
| 1003 | + createPortForwardingHelperEvent(event); |
| 1004 | + } else if (isNetworkOfferingEvent(eventType)) { |
| 1005 | + createNetworkOfferingEvent(event); |
| 1006 | + } else if (isVPNUserEvent(eventType)) { |
| 1007 | + handleVpnUserEvent(event); |
| 1008 | + } else if (isSecurityGroupEvent(eventType)) { |
| 1009 | + createSecurityGroupEvent(event); |
| 1010 | + } else if (isVmSnapshotEvent(eventType)) { |
| 1011 | + handleVMSnapshotEvent(event); |
| 1012 | + } else if (isVmSnapshotOnPrimaryEvent(eventType)) { |
| 1013 | + createVmSnapshotOnPrimaryEvent(event); |
| 1014 | + } else if (isBackupEvent(eventType)) { |
| 1015 | + createBackupEvent(event); |
| 1016 | + } |
| 1017 | + } catch (EntityExistsException e) { |
| 1018 | + s_logger.warn(String.format("Failed to create usage event id: %d type: %s due to %s", event.getId(), eventType, e.getMessage()), e); |
1014 | 1019 | } |
1015 | 1020 | } |
1016 | 1021 |
|
|
0 commit comments