You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/07/11 08:38:30 UTC
git commit: updated refs/heads/4.2 to c4e3213
Updated Branches:
refs/heads/4.2 ea4142bde -> c4e321313
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/c4e32131
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c4e32131
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c4e32131
Branch: refs/heads/4.2
Commit: c4e321313257a2a7c1da7382bb770364a33f9a8e
Parents: ea4142b
Author: Koushik Das <ko...@citrix.com>
Authored: Thu Jul 11 12:03:09 2013 +0530
Committer: Koushik Das <ko...@citrix.com>
Committed: Thu Jul 11 12:08:08 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/c4e32131/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);