Ravi Nori has uploaded a new change for review. Change subject: core : Upgrading a hypervisor automatically puts it into an Up state ......................................................................
core : Upgrading a hypervisor automatically puts it into an Up state When upgrading a hypervisor via the admin portal, once the install is finished the hypervisor returns (or tries to return) to an Up state Change-Id: Ib94ba543b347aab4eafe326e7fce84aac163be25 Bug-Url: https://bugzilla.redhat.com/1073070 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSStatus.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/25853/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java index ac10cd7..fd793f4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java @@ -83,7 +83,7 @@ Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.SetVdsStatus, - new SetVdsStatusVDSCommandParameters(getVdsId(), VDSStatus.NonResponsive)); + new SetVdsStatusVDSCommandParameters(getVdsId(), VDSStatus.Rebooted)); } /** diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSStatus.java index 811fa61..ee78904 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSStatus.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSStatus.java @@ -16,7 +16,8 @@ NonOperational(10), PendingApproval(11), Initializing(12), - Connecting(13); + Connecting(13), + Rebooted(14); private static final HashMap<Integer, VDSStatus> mappings = new HashMap<Integer, VDSStatus>(); private int intValue; 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 4b9579d..549dd48 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 @@ -507,7 +507,9 @@ _vdsManager.refreshCapabilities(processHardwareNeededAtomic, _vds); processHardwareCapsNeeded = processHardwareNeededAtomic.get(); refreshedCapabilities = true; - if (refreshReturnStatus != VDSStatus.NonOperational) { + if (_firstStatus == VDSStatus.Rebooted) { + _vdsManager.setStatus(VDSStatus.Maintenance, _vds); + } else if (refreshReturnStatus != VDSStatus.NonOperational) { _vdsManager.setStatus(VDSStatus.Up, _vds); } _saveVdsDynamic = true; -- To view, visit http://gerrit.ovirt.org/25853 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib94ba543b347aab4eafe326e7fce84aac163be25 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
