Martin Peřina has uploaded a new change for review. Change subject: engine: Notify host is Up only when InitVdsOnUp succeeded ......................................................................
engine: Notify host is Up only when InitVdsOnUp succeeded Display "State was set to Up for host XXX" notification in webadmin only when InitVdsOnUpCommand executes successfully for host. Change-Id: If0fab61b10bea280ca81eca74f2912b61bd58876 Bug-Url: https://bugzilla.redhat.com/1040918 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 2 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/23073/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index abaecf2..047e7a6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -131,6 +131,12 @@ } setSucceeded(initSucceeded); + + if (getSucceeded()) { + AuditLogableBase logable = new AuditLogableBase(getVds().getId()); + logable.addCustomValue("VdsStatus", getVds().getStatus().toString()); + AuditLogDirector.log(logable, AuditLogType.VDS_DETECTED); + } } private boolean initVirtResources() { 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 272b516..ef32a87 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 @@ -892,9 +892,12 @@ } else if (isVdsUpOrGoingToMaintenance || _vds.getStatus() == VDSStatus.Error) { return; } - AuditLogableBase logable = new AuditLogableBase(_vds.getId()); - logable.addCustomValue("VdsStatus", _vds.getStatus().toString()); - auditLog(logable, AuditLogType.VDS_DETECTED); + // show status UP in audit only when InitVdsOnUpCommand finished successfully + if (_vds.getStatus() != VDSStatus.Up) { + AuditLogableBase logable = new AuditLogableBase(_vds.getId()); + logable.addCustomValue("VdsStatus", _vds.getStatus().toString()); + auditLog(logable, AuditLogType.VDS_DETECTED); + } } private void refreshVmStats() { -- To view, visit http://gerrit.ovirt.org/23073 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0fab61b10bea280ca81eca74f2912b61bd58876 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
