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

bug 11701: removed host sync from startup, now only cluster sync happens from master during startup

This commit is contained in:
Abhinandan Prateek 2011-10-18 14:58:15 +05:30
parent 8ee0fd700b
commit aead68e544
1 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2509,39 +2509,6 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
throw new CloudRuntimeException("Com'on no control domain? What the crap?!#@!##$@");
}
protected void fullHostSync(StartupRoutingCommand cmd, Connection conn) {
try {
final HashMap<String, VmState> vmStates = new HashMap<String, VmState>();
Host lhost = Host.getByUuid(conn, _host.uuid);
Set<VM> vms = lhost.getResidentVMs(conn);
for (VM vm: vms) {
VM.Record record = vm.getRecord(conn);
if (record.isControlDomain || record.isASnapshot || record.isATemplate) {
continue; // Skip DOM0
}
String vm_name = record.nameLabel;
VmPowerState ps = record.powerState;
final State state = convertToState(ps);
Host host = record.residentOn;
String host_uuid = null;
if( ! isRefNull(host) ) {
host_uuid = host.getUuid(conn);
VmState vm_state = new StartupRoutingCommand.VmState(state, host_uuid);
vmStates.put(vm_name, vm_state);
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());
}
}
cmd.setChanges(vmStates);
} catch (final Throwable e) {
String msg = "Unable to get vms through host " + _host.uuid + " due to to " + e.toString();
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
}
}
protected ReadyAnswer execute(ReadyCommand cmd) {
Connection conn = getConnection();
@ -3929,7 +3896,19 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
StartupRoutingCommand cmd = new StartupRoutingCommand();
fillHostInfo(conn, cmd);
fullHostSync(cmd, conn);
Pool pool;
try {
pool = Pool.getByUuid(conn, _host.pool);
Pool.Record poolr = pool.getRecord(conn);
Host.Record hostr = poolr.master.getRecord(conn);
if (_host.uuid.equals(hostr.uuid)) {
s_logger.debug("Doing the initial cluster sync from the pool master " + _host.ip);
fullClusterSync(cmd, conn);
}
} catch (Exception e) {
s_logger.warn("Check for master failed, failing the probbaly initial Cluster sync ", e);
}
cmd.setHypervisorType(HypervisorType.XenServer);
cmd.setCluster(_cluster);
cmd.setPoolSync(false);
@ -6523,6 +6502,40 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected void fullClusterSync(StartupRoutingCommand cmd, Connection conn) {
try {
final HashMap<String, VmState> vmStates = new HashMap<String, VmState>();
Host lhost = Host.getByUuid(conn, _host.uuid);
Map<VM, VM.Record> vm_map = VM.getAllRecords(conn);
for (VM.Record record: vm_map.values()) {
if (record.isControlDomain || record.isASnapshot || record.isATemplate) {
continue; // Skip DOM0
}
String vm_name = record.nameLabel;
VmPowerState ps = record.powerState;
final State state = convertToState(ps);
Host host = record.residentOn;
String host_uuid = null;
if( ! isRefNull(host) ) {
host_uuid = host.getUuid(conn);
VmState vm_state = new StartupRoutingCommand.VmState(state, host_uuid);
vmStates.put(vm_name, vm_state);
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());
}
}
cmd.setChanges(vmStates);
} catch (final Throwable e) {
String msg = "Unable to get vms through host " + _host.uuid + " due to to " + e.toString();
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
}
}
protected HashMap<String, Pair<String, State>> fullClusterSync(Connection conn) {
s_vms.clear(_cluster);
try {