Arik Hadas has uploaded a new change for review. Change subject: core: do not consider powering up -> up as powered up transition ......................................................................
core: do not consider powering up -> up as powered up transition If the VM status is changed from powering-up to up, we should not do the handling we do for powered up VMs, as we already did it when the VM was switched to powering-up state. Checking the display as part of the check that determines whether the VM should be handled as VM that was powered-up, is not needed and thus it is also removed as part of this change. Change-Id: Ifc72aa638ca5722fe5bb50c600374f47a42511cd Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 4 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/32121/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 27c51ec..f910ceb 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1724,17 +1724,10 @@ } if (vmToUpdate != null) { logVmStatusTransition(vmToUpdate, runningVm); - // open spice for dedicated VMs - if (vmToUpdate.getStatus() != VMStatus.Up && runningVm.getStatus() == VMStatus.Up - || vmToUpdate.getStatus() != VMStatus.PoweringUp - && runningVm.getStatus() == VMStatus.PoweringUp) { - // Vm moved to powering Up or up status - launch spice - // if no current client ip already connected. - if (runningVm.getDisplay() != null) { - _poweringUpVms.add(runningVm.getId()); - } else { - log.error("UpdateRepository - runningVm.display is null, cannot start spice for it"); - } + + if ((vmToUpdate.getStatus() != VMStatus.Up && vmToUpdate.getStatus() != VMStatus.PoweringUp && runningVm.getStatus() == VMStatus.Up) + || (vmToUpdate.getStatus() != VMStatus.PoweringUp && runningVm.getStatus() == VMStatus.PoweringUp)) { + _poweringUpVms.add(runningVm.getId()); } // Generate an event for those machines that transition from "PoweringDown" to -- To view, visit http://gerrit.ovirt.org/32121 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc72aa638ca5722fe5bb50c600374f47a42511cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
