From 9e1ee30ea3c4df034050b8656ff75fc0b283a516 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Thu, 11 Aug 2011 14:28:32 -0700
Subject: [PATCH] bug 11019: Let VM sync to coordinate with possible
 VM-relocation under VMware when VM is in starting time

---
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 63ec27da1d3..11c02b2cc44 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1557,6 +1557,13 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         }
 
         if(trackExternalChange) {
+        	if(serverState == State.Starting) {
+        		if(vm.getHostId() != null && vm.getHostId() != hostId) {
+        			s_logger.info("CloudStack is starting VM on host " + vm.getHostId() + ", but status report comes from a different host " + hostId + ", skip status sync for vm: " + vm.getInstanceName());
+        			return null;
+        		}
+        	}
+        	
             if(vm.getHostId() == null || hostId != vm.getHostId()) {
                 try {
                     stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);