apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

UNKNOWN state is not used by xenserverJava

Browse Source
This commit is contained in:
anthony 2010-11-29 15:25:36 -08:00
parent fff1dd874a
commit b420ec7797
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,6 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
s_statesTable.put(Types.VmPowerState.PAUSED, State.Running); s_statesTable.put(Types.VmPowerState.PAUSED, State.Running);
s_statesTable.put(Types.VmPowerState.RUNNING, State.Running); s_statesTable.put(Types.VmPowerState.RUNNING, State.Running);
s_statesTable.put(Types.VmPowerState.SUSPENDED, State.Running); s_statesTable.put(Types.VmPowerState.SUSPENDED, State.Running);
s_statesTable.put(Types.VmPowerState.UNKNOWN, State.Unknown);
s_statesTable.put(Types.VmPowerState.UNRECOGNIZED, State.Unknown); s_statesTable.put(Types.VmPowerState.UNRECOGNIZED, State.Unknown);
} }
@ -473,7 +472,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
VM.Record vmr = vbdr.VM.getRecord(conn); VM.Record vmr = vbdr.VM.getRecord(conn);
if ((!isRefNull(vmr.residentOn) && vmr.residentOn.getUuid(conn).equals(_host.uuid)) if ((!isRefNull(vmr.residentOn) && vmr.residentOn.getUuid(conn).equals(_host.uuid))
|| (isRefNull(vmr.residentOn) && !isRefNull(vmr.affinity) && vmr.affinity.getUuid(conn).equals(_host.uuid))) { || (isRefNull(vmr.residentOn) && !isRefNull(vmr.affinity) && vmr.affinity.getUuid(conn).equals(_host.uuid))) {
if (vmr.powerState != VmPowerState.HALTED && vmr.powerState != VmPowerState.UNKNOWN && vmr.powerState != VmPowerState.UNRECOGNIZED) { if (vmr.powerState != VmPowerState.HALTED && vmr.powerState != VmPowerState.UNRECOGNIZED) {
try { try {
vbdr.VM.hardShutdown(conn); vbdr.VM.hardShutdown(conn);
} catch (XenAPIException e) { } catch (XenAPIException e) {
@ -2352,7 +2351,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
VM vm = vms.iterator().next(); VM vm = vms.iterator().next();
VmPowerState vps = vm.getPowerState(conn); VmPowerState vps = vm.getPowerState(conn);
if (vps != null && vps != VmPowerState.HALTED && vps != VmPowerState.UNKNOWN && vps != VmPowerState.UNRECOGNIZED) { if (vps != null && vps != VmPowerState.HALTED && vps != VmPowerState.UNRECOGNIZED) {
return convertToState(vps); return convertToState(vps);
} }
} catch (XenAPIException e) { } catch (XenAPIException e) {