Liron Aravot has uploaded a new change for review. Change subject: core: audit log on error during GetVms\Templates from export domain ......................................................................
core: audit log on error during GetVms\Templates from export domain This patch adds an audit log error when having error in the execution of GetVmsFromExportDomainQuery/GetTemplatesFromExportDomainQuery queries. Change-Id: If107c950e48364340b472ad590b7846f738c9765 Bug-Url: https://bugzilla.redhat.com/861126 Signed-off-by: Liron Aravot <lara...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/10440/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java index f7621b3..63a74b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java @@ -36,7 +36,15 @@ StorageDomainStatic storage = DbFacade.getInstance().getStorageDomainStaticDao().get( getParameters().getStorageDomainId()); if (storage.getstorage_domain_type() == StorageDomainType.ImportExport) { - VDSReturnValue retVal = executeVerb(); + VDSReturnValue retVal = null; + try { + retVal = executeVerb(); + } catch (RuntimeException e) { + AuditLogableBase logable = new AuditLogableBase(); + logable.AddCustomValue("StorageDomainName", storage.getstorage_name()); + AuditLogDirector.log(logable, AuditLogType.IMPORTEXPORT_GET_VMS_INFO_FAILED); + throw e; + } buildOvfReturnValue(retVal.getReturnValue()); } else { getQueryReturnValue().setReturnValue(new java.util.ArrayList<VM>()); 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 4cd3b99..35cd9a9 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 @@ -541,6 +541,7 @@ IMPORTEXPORT_STARTING_REMOVE_VM(1167), IMPORTEXPORT_REMOVE_VM(1160), IMPORTEXPORT_REMOVE_VM_FAILED(1161), + IMPORTEXPORT_GET_VMS_INFO_FAILED(1162), IMPORTEXPORT_FAILED_TO_IMPORT_VM(1168), IMPORTEXPORT_FAILED_TO_IMPORT_TEMPLATE(1169), IMPORTEXPORT_IMPORT_TEMPLATE_INVALID_INTERFACES(1170, AuditLogTimeInterval.MINUTE.getValue()), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index 9c3f4e2..10fd498 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -609,6 +609,7 @@ mSeverities.put(AuditLogType.IMPORTEXPORT_IMPORT_VM_FAILED, AuditLogSeverity.ERROR); mSeverities.put(AuditLogType.IMPORTEXPORT_REMOVE_VM, AuditLogSeverity.NORMAL); mSeverities.put(AuditLogType.IMPORTEXPORT_REMOVE_VM_FAILED, AuditLogSeverity.ERROR); + mSeverities.put(AuditLogType.IMPORTEXPORT_GET_VMS_INFO_FAILED, AuditLogSeverity.ERROR); mSeverities.put(AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE, AuditLogSeverity.NORMAL); mSeverities.put(AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE_FAILED, AuditLogSeverity.ERROR); mSeverities.put(AuditLogType.IMPORTEXPORT_EXPORT_TEMPLATE, AuditLogSeverity.NORMAL); diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 1e9d385..4bd93e2 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -501,6 +501,7 @@ IMPORTEXPORT_STARTING_REMOVE_VM=Starting to remove Vm ${VmName} remove from ${StorageDomainName} IMPORTEXPORT_REMOVE_VM=Vm ${VmName} was removed from ${StorageDomainName} IMPORTEXPORT_REMOVE_VM_FAILED=Failed to remove Vm ${VmName} remove from ${StorageDomainName} +IMPORTEXPORT_GET_VMS_INFO_FAILED=Failed to retrieve VM/Templates information from export domain ${StorageDomainName} USER_ADD_ROLE_WITH_ACTION_GROUP=Role ${RoleName} was added by ${UserName} USER_ADD_ROLE_WITH_ACTION_GROUP_FAILED=Failed to add role ${RoleName} VDS_ALERT_FENCING_IS_NOT_CONFIGURED=Failed to verify Power Management configuration for Host ${VdsName}. -- To view, visit http://gerrit.ovirt.org/10440 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If107c950e48364340b472ad590b7846f738c9765 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
