Martin Peřina has uploaded a new change for review. Change subject: core: Fix host status changed to Connecting logging ......................................................................
core: Fix host status changed to Connecting logging Display log message that host has changed status Connecting only when status change really happened. Change-Id: I0dfe369ea8c0a6460db9cc548b3695614a90d1b9 Bug-Url: https://bugzilla.redhat.com/1182510 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/36964/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index 01db9e9..6cfbb9a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -926,7 +926,7 @@ VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED(9005, AuditLogSeverity.ALERT), CANNOT_HIBERNATE_RUNNING_VMS_AFTER_CLUSTER_CPU_UPGRADE(9006, AuditLogSeverity.WARNING), VDS_ALERT_SECONDARY_AGENT_USED_FOR_FENCE_OPERATION(9007, AuditLogSeverity.ALERT), - VDS_HOST_NOT_RESPONDING_CONNECTING(9008, AuditLogSeverity.WARNING, AuditLogTimeInterval.MINUTE.getValue() * 3), + VDS_HOST_NOT_RESPONDING_CONNECTING(9008, AuditLogSeverity.WARNING), VDS_ALERT_PM_HEALTH_CHECK_FENCE_AGENT_NON_RESPONSIVE(9009, AuditLogSeverity.ALERT), VDS_ALERT_PM_HEALTH_CHECK_START_MIGHT_FAIL(9010, AuditLogSeverity.ALERT), VDS_ALERT_PM_HEALTH_CHECK_STOP_MIGHT_FAIL(9011, AuditLogSeverity.ALERT), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 3dc4a41..b8b11f4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -695,12 +695,12 @@ boolean saveToDb = true; if (cachedVds.getStatus() != VDSStatus.Down) { long timeoutToFence = calcTimeoutToFence(cachedVds.getVmCount(), cachedVds.getSpmStatus()); - logHostNonResponding(timeoutToFence); if (inGracePeriod(timeoutToFence)) { if (cachedVds.getStatus() != VDSStatus.Connecting && cachedVds.getStatus() != VDSStatus.PreparingForMaintenance && cachedVds.getStatus() != VDSStatus.NonResponsive) { setStatus(VDSStatus.Connecting, cachedVds); + logChangeStatusToConnecting(timeoutToFence); } else { saveToDb = false; } @@ -747,7 +747,7 @@ AuditLogDirector.log(logable, AuditLogType.VDS_FAILURE); } - private void logHostNonResponding(long timeoutToFence) { + private void logChangeStatusToConnecting(long timeoutToFence) { log.warn("Host '{}' is not responding. It will stay in Connecting state for a grace period " + "of {} seconds and after that an attempt to fence the host will be issued.", cachedVds.getName(), -- To view, visit http://gerrit.ovirt.org/36964 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0dfe369ea8c0a6460db9cc548b3695614a90d1b9 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
