From 0f4ffd88976437bbc3485911b186f4f52fb2d8a0 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Mon, 20 Aug 2012 10:14:51 -0700 Subject: [PATCH] recreate router if failed Conflicts: server/src/com/cloud/vm/VirtualMachineManagerImpl.java --- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index af906f91ece..4a86989394c 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -742,12 +742,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene _networkMgr.prepare(vmProfile, dest, ctx); if (vm.getHypervisorType() != HypervisorType.BareMetal) { _storageMgr.prepare(vmProfile, dest, recreate); - recreate = false; - } - //since StorageMgr succeeded in volume creation, resue Volume for further tries until current cluster has capacity - if(!reuseVolume){ - reuseVolume = true; - } + } vmGuru.finalizeVirtualMachineProfile(vmProfile, dest, ctx); VirtualMachineTO vmTO = hvGuru.implement(vmProfile);