You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/01/03 08:26:54 UTC
git commit: updated refs/heads/4.3 to 3fe9426
Updated Branches:
refs/heads/4.3 914bd1230 -> 3fe942682
CLOUDSTACK-5552 fixed private gateway clean up in DB when create failed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3fe94268
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3fe94268
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3fe94268
Branch: refs/heads/4.3
Commit: 3fe9426824be5543d86deea70a393f9db1c22245
Parents: 914bd12
Author: Jayapal <ja...@apache.org>
Authored: Thu Jan 2 11:52:23 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Fri Jan 3 12:56:28 2014 +0530
----------------------------------------------------------------------
.../network/element/VpcVirtualRouterElement.java | 16 ++++++++++++----
.../cloud/network/vpc/NetworkACLManagerImpl.java | 8 ++++++--
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe94268/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 1f5846b..f4d16e1 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -363,6 +363,9 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
s_logger.debug ("Failed to apply network acl id "+ gateway.getNetworkACLId() + " on gateway ");
return false;
}
+ } else {
+ s_logger.debug ("Failed to setup private gateway "+ gateway);
+ return false;
}
return true;
}
@@ -425,10 +428,15 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
return true;
}
- if (!_vpcRouterMgr.applyNetworkACLs(config, rules, routers, false)) {
- throw new CloudRuntimeException("Failed to apply network acl rules in network " + config.getId());
- } else {
- return true;
+ try {
+ if (!_vpcRouterMgr.applyNetworkACLs(config, rules, routers, false)) {
+ return false;
+ } else {
+ return true;
+ }
+ } catch (Exception ex) {
+ s_logger.debug("Failed to apply network acl in network " + config.getId());
+ return false;
}
} else {
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe94268/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 7bb8b13..72d8f81 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -381,9 +381,13 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana
throw new CloudRuntimeException("Failed to initialize vpc elements");
}
- for (VpcProvider provider: vpcElements){
- return provider.applyACLItemsToPrivateGw(gateway, rules);
+ try {
+ for (VpcProvider provider: vpcElements){
+ return provider.applyACLItemsToPrivateGw(gateway, rules);
}
+ } catch(ResourceUnavailableException e) {
+ s_logger.debug("Failed to apply acl to private gateway " + gateway);
+ }
return false;
}