etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12348: removing setting of start state from outside vm-sync

This commit is contained in:
Abhinandan Prateek 2011-12-16 15:38:07 +05:30
parent b506171aac
commit e632323901
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -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.");