cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [24/50] git commit: updated refs/heads/sdnextensions to bcfb4e6
Date Fri, 12 Jul 2013 07:51:19 GMT
CLOUDSTACK-3441: [Load Test] High delays between VM being allocated to Pod and network implementation
causing delays in VM deployment
This is a regresion caused due to fix for CLOUDSTACK-70. In order to fix network restart scenario,
delays got introduced in the user VM deployment scenario.
Fixed it by separating out the network restart and new VM deployment scenario such that the
latter is not affected due to the fix for CLOUDSTACK-70.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3e8bfce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3e8bfce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3e8bfce

Branch: refs/heads/sdnextensions
Commit: e3e8bfce16f36c1aca1e706725aafab53f1c795c
Parents: 873377c
Author: Koushik Das <koushik.das@citrix.com>
Authored: Thu Jul 11 12:03:09 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Thu Jul 11 12:03:09 2013 +0530

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3e8bfce/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 ddfa998..8d73941 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1446,7 +1446,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
             // dest has pod=null, for Basic Zone findOrDeployVRs for all Pods
             List<DeployDestination> destinations = new ArrayList<DeployDestination>();
 
-            if (dest.getDataCenter().getNetworkType() == NetworkType.Basic) {
+            // for basic zone, if 'dest' has pod set to null then this is network restart
scenario otherwise it is a vm deployment scenario
+            if (dest.getDataCenter().getNetworkType() == NetworkType.Basic && dest.getPod()
== null) {
                 // Find all pods in the data center with running or starting user vms
                 long dcId = dest.getDataCenter().getId();
                 List<HostPodVO> pods = listByDataCenterIdVMTypeAndStates(dcId, VirtualMachine.Type.User,
VirtualMachine.State.Starting, VirtualMachine.State.Running);


Mime
View raw message