You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/31 11:26:07 UTC
git commit: updated refs/heads/4.3-forward to 62a259f
Updated Branches:
refs/heads/4.3-forward f4db8df66 -> 62a259ffa
CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating
usage events are enabled
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62a259ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62a259ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62a259ff
Branch: refs/heads/4.3-forward
Commit: 62a259ffa9b4daabcbe4f9afe9a78eadebbb7bff
Parents: f4db8df
Author: David Grizzanti <dg...@gmail.com>
Authored: Fri Jan 31 11:25:59 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 11:25:59 2014 +0100
----------------------------------------------------------------------
.../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a259ff/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index bd58e39..b830910 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1405,7 +1405,8 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
if (generateUsageEvent) {
// Generate usage event right after all rules were marked for revoke
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), 0, lb.getId(),
+ Network network = _networkModel.getNetwork(lb.getNetworkId());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_DELETE, lb.getAccountId(), network.getDataCenterId(), lb.getId(),
null, LoadBalancingRule.class.getName(), lb.getUuid());
}
@@ -2052,6 +2053,11 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
List<String> serviceStates = new ArrayList<String>();
List<LoadBalancerVMMapVO> vmLoadBalancerMappings = null;
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());
List<Long> appliedInstanceIdList = new ArrayList<Long>();