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

bug 12875: Every time XenServerResource sends fullsync to CS, it should clear up VM status for this cluster and update with latest VM status for this cluster getting from XAPI. 

reviewed by: anthony
This commit is contained in:
abhi 2012-01-25 11:32:10 +05:30
parent bf4be42d9c
commit 273de60a5f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6644,7 +6644,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected HashMap<String, Pair<String, State>> fullClusterSync(Connection conn) {
XenServerPoolVms vms = new XenServerPoolVms();
synchronized (_cluster.intern()) {
s_vms.clear(_cluster);
}
try {
Map<VM, VM.Record> vm_map = VM.getAllRecords(conn); //USE THIS TO GET ALL VMS FROM A CLUSTER
for (VM.Record record: vm_map.values()) {
@ -6658,7 +6660,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
String host_uuid = null;
if( ! isRefNull(host) ) {
host_uuid = host.getUuid(conn);
vms.put(_cluster, host_uuid, vm_name, state);
synchronized (_cluster.intern()) {
s_vms.put(_cluster, host_uuid, vm_name, state);
}
}
if (s_logger.isTraceEnabled()) {
s_logger.trace("VM " + vm_name + ": powerstate = " + ps + "; vm state=" + state.toString());
@ -6669,7 +6673,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
}
return vms.getClusterVmState(_cluster);
return s_vms.getClusterVmState(_cluster);
}