From e6323239013135a75d07104262a90f086c753ff3 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@citrix.com>
Date: Fri, 16 Dec 2011 15:38:07 +0530
Subject: [PATCH] bug 12348: removing setting of start state from outside
 vm-sync

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c97fc5d245c..d38c5c5dbad 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1155,7 +1155,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                 }
             }
 
-            state = State.Running;
+            //state = State.Running;  VM sync will mark it as started once detected on agent
             return new StartAnswer(cmd);
         } catch (Exception e) {
             s_logger.warn("Catch Exception: " + e.getClass().toString() + " due to " + e.toString(), e);
@@ -1164,10 +1164,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         } finally {
             synchronized (s_vms) {
                 if (state != State.Stopped) { 
-                	s_logger.debug("The VM is in " + state + ", detected problem during startup : " + vm);
+                	s_logger.debug("The VM " + vmName + " is in " + state + " state.");
                     s_vms.put(_cluster, _name, vmName, state);
                 } else {
-                	s_logger.debug("The VM is in stopped state, detected problem during startup : " + vm);
+                	s_logger.debug("The VM is in stopped state, detected problem during startup : " + vmName);
                     s_vms.remove(_cluster, _name, vmName);
                 }
             }
@@ -6713,6 +6713,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                 } else if (oldState == State.Starting) {
                     s_logger.warn("Ignoring VM " + vm + " in transition state starting.");
                 } else if (oldState == State.Stopped) {
+                	s_logger.debug("VM missing " + vm + " old state stopped so removing.");
                     s_vms.remove(_cluster, host_uuid, vm);
                 } else if (oldState == State.Migrating) {
                     s_logger.warn("Ignoring VM " + vm + " in migrating state.");