From e3e8bfce16f36c1aca1e706725aafab53f1c795c Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Thu, 11 Jul 2013 12:03:09 +0530 Subject: [PATCH] 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. --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ddfa9989fe6..8d73941748a 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 destinations = new ArrayList(); - 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 pods = listByDataCenterIdVMTypeAndStates(dcId, VirtualMachine.Type.User, VirtualMachine.State.Starting, VirtualMachine.State.Running);