apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled

Browse Source 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit fc796632ed984f37fdf32e6aedf26d179a70b22f)
Signed-off-by: Daan Hoogland <daan@onecht.net>
This commit is contained in:
David Grizzanti 2013-11-06 12:57:46 -05:00 committed by Daan Hoogland
parent 7d0472bdaa
commit ce4b718f4a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -1348,8 +1348,9 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
if (generateUsageEvent) { if (generateUsageEvent) {
// Generate usage event right after all rules were marked for revoke // Generate usage event right after all rules were marked for revoke
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), 0, lb.getId(), null, LoadBalancingRule.class.getName(), Network network = _networkModel.getNetwork(lb.getNetworkId());
lb.getUuid()); UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), network.getDataCenterId(), lb.getId(),
null, LoadBalancingRule.class.getName(), lb.getUuid());
} }
return backupMaps; return backupMaps;
@ -1970,6 +1971,11 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
List<String> serviceStates = new ArrayList<String>(); List<String> serviceStates = new ArrayList<String>();
List<LoadBalancerVMMapVO> vmLoadBalancerMappings = null; List<LoadBalancerVMMapVO> vmLoadBalancerMappings = null;
vmLoadBalancerMappings = _lb2VmMapDao.listByLoadBalancerId(loadBalancerId); vmLoadBalancerMappings = _lb2VmMapDao.listByLoadBalancerId(loadBalancerId);
if(vmLoadBalancerMappings == null) {
String msg = "no VM Loadbalancer Mapping found";
s_logger.error(msg);
throw new CloudRuntimeException(msg);
}
Map<Long, String> vmServiceState = new HashMap<Long, String>(vmLoadBalancerMappings.size()); Map<Long, String> vmServiceState = new HashMap<Long, String>(vmLoadBalancerMappings.size());
List<Long> appliedInstanceIdList = new ArrayList<Long>(); List<Long> appliedInstanceIdList = new ArrayList<Long>();