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/07 13:28:24 UTC
git commit: updated refs/heads/master to ab3a2c2
Updated Branches:
refs/heads/master 249993b2f -> ab3a2c20c
CLOUDSTACK-5552 fixed private gateway DB clean up on router upgrade required
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab3a2c20
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab3a2c20
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab3a2c20
Branch: refs/heads/master
Commit: ab3a2c20cda0e33ca0d3990246cba26581965377
Parents: 249993b
Author: Jayapal <ja...@apache.org>
Authored: Tue Jan 7 16:29:55 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue Jan 7 17:57:58 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 6 ++++--
.../VpcVirtualNetworkApplianceManagerImpl.java | 19 ++++++++++++++-----
.../com/cloud/network/vpc/VpcManagerImpl.java | 3 ++-
3 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab3a2c20/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 000ed48..b5db2d5 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3967,8 +3967,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
List<NicVO> nics = _nicDao.listByVmId(routerId);
for (NicVO n : nics) {
NetworkVO nc = _networkDao.findById(n.getNetworkId());
- if (nc.getTrafficType() == TrafficType.Control) {
+ if (nc != null && nc.getTrafficType() == TrafficType.Control) {
routerControlIpAddress = n.getIp4Address();
+ // router will have only one control ip
+ break;
}
}
@@ -4153,7 +4155,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
//Checks if the router is at the required version
// Compares MS version and router version
- private boolean checkRouterVersion(VirtualRouter router){
+ protected boolean checkRouterVersion(VirtualRouter router){
if(!routerVersionCheckEnabled.value()){
//Router version check is disabled.
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab3a2c20/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 8e8ffa0..6e4b771 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -891,6 +891,10 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
Network network = _networkModel.getNetwork(gateway.getNetworkId());
NicProfile requested = createPrivateNicProfileForGateway(gateway);
+ if (!checkRouterVersion(router)) {
+ s_logger.warn("Router requires upgrade. Unable to send command to router: " + router.getId());
+ return false;
+ }
NicProfile guestNic = _itMgr.addVmToNetwork(router, network, requested);
//setup source nat
@@ -939,11 +943,16 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
Commands cmds = new Commands(Command.OnError.Stop);
createVpcAssociatePrivateIPCommands(router, privateIps, cmds, add);
- if (sendCommandsToRouter(router, cmds)) {
- s_logger.debug("Successfully applied ip association for ip " + ip + " in vpc network " + network);
- return true;
- } else {
- s_logger.warn("Failed to associate ip address " + ip + " in vpc network " + network);
+ try{
+ if (sendCommandsToRouter(router, cmds)) {
+ s_logger.debug("Successfully applied ip association for ip " + ip + " in vpc network " + network);
+ return true;
+ } else {
+ s_logger.warn("Failed to associate ip address " + ip + " in vpc network " + network);
+ return false;
+ }
+ }catch (Exception ex) {
+ s_logger.warn("Failed to send " + (add ?"add ":"delete ") + " private network " + network + " commands to rotuer ");
return false;
}
} else if (router.getState() == State.Stopped || router.getState() == State.Stopping) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab3a2c20/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index cb3d9af..4e595e4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1474,7 +1474,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
if (!success) {
if (destroyOnFailure) {
s_logger.debug("Destroying private gateway " + vo + " that failed to start");
- if (deleteVpcPrivateGateway(gatewayId)) {
+ // calling deleting from db because on createprivategateway fail, destroyPrivateGateway is already called
+ if (deletePrivateGatewayFromTheDB(getVpcPrivateGateway(gatewayId))) {
s_logger.warn("Successfully destroyed vpc " + vo + " that failed to start");
} else {
s_logger.warn("Failed to destroy vpc " + vo + " that failed to start");