Oved Ourfali has uploaded a new change for review. Change subject: filling the call stack in the audit log ......................................................................
filling the call stack in the audit log Following the addition of a call stack field to the audit log table, this patch adds some uses to this field. Change-Id: I4e2231d602dfe50febfc932b24fe3a3e75d57ecb Signed-off-by: Oved Ourfali <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 6 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/15879/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 9a7031e..f619b9e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -350,6 +350,7 @@ ExceptionUtils.getMessage(e)); addCustomValue("SnapshotName", getSnapshotName()); addCustomValue("VmName", getVmName()); + updateCallStackFromThrowable(e); AuditLogDirector.log(this, AuditLogType.USER_CREATE_LIVE_SNAPSHOT_FINISHED_FAILURE); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index 9ffc2da..ec510b6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -234,6 +234,7 @@ AuditLogableBase logable = new AuditLogableBase(); logable.setVdsId(getVds().getId()); logable.addCustomValue("Operation", getParameters().getAction().name()); + logable.updateCallStackFromThrowable(vdsReturnValue.getExceptionObject()); AuditLogDirector.log(logable, AuditLogType.VDS_ALERT_SECONDARY_AGENT_USED_FOR_FENCE_OPERATION); handleSpecificCommandActions(); } 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 1712821..c8bc9a6 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 @@ -329,7 +329,9 @@ if (!returnValue.getSucceeded()) { getReturnValue().getFault().setError(returnValue.getVdsError().getCode()); getReturnValue().getFault().setMessage(returnValue.getVdsError().getMessage()); - AuditLogDirector.log(new AuditLogableBase(upServerId), AuditLogType.GLUSTER_SERVERS_LIST_FAILED); + AuditLogableBase logable = new AuditLogableBase(upServerId); + logable.updateCallStackFromThrowable(returnValue.getExceptionObject()); + AuditLogDirector.log(logable, AuditLogType.GLUSTER_SERVERS_LIST_FAILED); glusterPeerListSucceeded = false; } else { glusterServers = (List<GlusterServerInfo>) returnValue.getReturnValue(); @@ -344,7 +346,9 @@ if (!returnValue.getSucceeded()) { getReturnValue().getFault().setError(returnValue.getVdsError().getCode()); getReturnValue().getFault().setMessage(returnValue.getVdsError().getMessage()); - AuditLogDirector.log(new AuditLogableBase(getVdsId()), AuditLogType.GLUSTER_SERVER_ADD_FAILED); + AuditLogableBase logable = new AuditLogableBase(getVdsId()); + logable.updateCallStackFromThrowable(returnValue.getExceptionObject()); + AuditLogDirector.log(logable, AuditLogType.GLUSTER_SERVER_ADD_FAILED); glusterPeerProbeSucceeded = false; } return returnValue.getSucceeded(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index c8c0ee3..862f121 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -277,7 +277,7 @@ // Alert if the restart fails: if (!result.getSucceeded()) { - AuditLogDirector.log(event, AuditLogType.HA_VM_RESTART_FAILED); + AuditLogDirector.log(event, AuditLogType.HA_VM_RESTART_FAILED); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 001f464..2f8efc4 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -735,6 +735,8 @@ * the Throwable object containing the call stack */ public void updateCallStackFromThrowable(Throwable throwable) { - setCallStack(ExceptionUtils.getStackTrace(throwable)); + if (throwable != null) { + setCallStack(ExceptionUtils.getStackTrace(throwable)); + } } } 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 e2db5f5..df39e2e 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 @@ -327,6 +327,7 @@ DbFacade.getInstance().getVdsDynamicDao().updateStatus(_vds.getId(), VDSStatus.Initializing); AuditLogableBase logable = new AuditLogableBase(_vds.getId()); logable.addCustomValue("ErrorMessage", ex.getMessage()); + logable.updateCallStackFromThrowable(ex); AuditLogDirector.log(logable, AuditLogType.VDS_INITIALIZING); log.warnFormat( "Failed to refresh VDS , vds = {0} : {1}, error = {2}, continuing.", @@ -544,6 +545,7 @@ new VdsIdAndVdsVDSCommandParametersBase(vds)); if (!ret.getSucceeded()) { AuditLogableBase logable = new AuditLogableBase(vds.getId()); + logable.updateCallStackFromThrowable(ret.getExceptionObject()); AuditLogDirector.log(logable, AuditLogType.VDS_FAILED_TO_GET_HOST_HARDWARE_INFO); } } @@ -639,6 +641,7 @@ TimeUnit.MILLISECONDS.toSeconds(timeoutToFence), ex.getMessage()); AuditLogableBase logable = new AuditLogableBase(vds.getId()); + logable.updateCallStackFromThrowable(ex); AuditLogDirector.log(logable, AuditLogType.VDS_FAILURE); ResourceManager.getInstance().getEventListener().vdsNotResponding(vds); } -- To view, visit http://gerrit.ovirt.org/15879 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e2231d602dfe50febfc932b24fe3a3e75d57ecb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
