1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled

Kelven Yang · Kelven Yang · commit 464d7937549b · 2011-06-15T18:37:38.000-07:00
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java
@@ -43,4 +43,11 @@ public interface HypervisorGuru extends Adapter {
      * @return delegated host id if the command will be delegated
      */
     long getCommandHostDelegation(long hostId, Command cmd);
+    
+    /**
+     *  @return true if VM can be migrated independently with CloudStack, and therefore CloudStack needs to track and reflect host change
+     *  into CloudStack database, false if CloudStack enforces VM sync logic
+     *  
+     */
+    boolean trackVmHostChange();
 }
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -52,4 +52,9 @@ public <T extends VirtualMachine> VirtualMachineTO implement(
 
 		return to;
 	}
+	
+	@Override
+    public boolean trackVmHostChange() {
+    	return false;
+    }
 }
diff --git a/server/src/com/cloud/hypervisor/XenServerGuru.java b/server/src/com/cloud/hypervisor/XenServerGuru.java
@@ -58,4 +58,9 @@ public <T extends VirtualMachine> VirtualMachineTO implement(VirtualMachineProfi
         
         return to;
     }
+    
+	@Override
+    public boolean trackVmHostChange() {
+    	return false;
+    }
 }
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1444,16 +1444,15 @@ public Commands deltaSync(long hostId, Map<String, State> newStates) {
         Map<Long, AgentVmInfo> states = convertToInfos(newStates);
         Commands commands = new Commands(OnError.Continue);
 
-        boolean nativeHA = _agentMgr.isHostNativeHAEnabled(hostId);
-
         for (Map.Entry<Long, AgentVmInfo> entry : states.entrySet()) {
             AgentVmInfo info = entry.getValue();
 
             VMInstanceVO vm = info.vm;
 
             Command command = null;
             if (vm != null) {
-                command = compareState(vm, info, false, nativeHA);
+                HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
+                command = compareState(vm, info, false, hvGuru.trackVmHostChange());
             } else {
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("Cleaning up a VM that is no longer found: " + info.name);
@@ -1666,8 +1665,6 @@ public Commands fullSync(final long hostId, final Map<String, State> newStates)
 
         Map<Long, AgentVmInfo> infos = convertToInfos(newStates);
 
-        boolean nativeHA = _agentMgr.isHostNativeHAEnabled(hostId);
-
         for (VMInstanceVO vm : vms) {
             AgentVmInfo info = infos.remove(vm.getId());
 
@@ -1678,30 +1675,33 @@ public Commands fullSync(final long hostId, final Map<String, State> newStates)
             } else {
                 castedVm = info.vm;
             }
+            
+            HypervisorGuru hvGuru = _hvGuruMgr.getGuru(castedVm.getHypervisorType());
 
-            Command command = compareState(castedVm, info, true, nativeHA);
+            Command command = compareState(castedVm, info, true, hvGuru.trackVmHostChange());
             if (command != null) {
                 commands.addCommand(command);
             }
         }
 
         for (final AgentVmInfo left : infos.values()) {
-            if (nativeHA) {
-                for (VirtualMachineGuru<? extends VMInstanceVO> vmGuru : _vmGurus.values()) {
-                    VMInstanceVO vm = vmGuru.findByName(left.name);
-                    if (vm == null) {
+            for (VirtualMachineGuru<? extends VMInstanceVO> vmGuru : _vmGurus.values()) {
+                VMInstanceVO vm = vmGuru.findByName(left.name);
+                if (vm == null) {
+                    s_logger.warn("Stopping a VM that we have no record of: " + left.name);
+                    commands.addCommand(cleanup(left.name));
+                } else {
+                    HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
+                    if(hvGuru.trackVmHostChange()) {
+	                    Command command = compareState(vm, left, true, true);
+	                    if (command != null) {
+	                        commands.addCommand(command);
+	                    }
+                    } else {
                         s_logger.warn("Stopping a VM that we have no record of: " + left.name);
                         commands.addCommand(cleanup(left.name));
-                    } else {
-                        Command command = compareState(vm, left, true, nativeHA);
-                        if (command != null) {
-                            commands.addCommand(command);
-                        }
                     }
                 }
-            } else {
-                s_logger.warn("Stopping a VM that we have no record of: " + left.name);
-                commands.addCommand(cleanup(left.name));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,9 @@ public <T extends VirtualMachine> VirtualMachineTO implement(`
`52`	`52`
`53`	`53`	`return to;`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ @Override`
	`57`	`+ public boolean trackVmHostChange() {`
	`58`	`+ return false;`
	`59`	`+ }`
`55`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,9 @@ public <T extends VirtualMachine> VirtualMachineTO implement(VirtualMachineProfi`
`58`	`58`
`59`	`59`	`return to;`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ @Override`
	`63`	`+ public boolean trackVmHostChange() {`
	`64`	`+ return false;`
	`65`	`+ }`
`61`	`66`	`}`