Greg Padgett has uploaded a new change for review. Change subject: core: show LUN id in audit log when SD partially inaccessible (#854214) ......................................................................
core: show LUN id in audit log when SD partially inaccessible (#854214) https://bugzilla.redhat.com/854214 When an SD is not accessible (e.g. VDSM reports iSCSI error), the audit log message now reports the affected lun instead of just the connection. Change-Id: I6ba766c552a56940c4559b4cd73702627ff13eed Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/8028/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java index 1a09bc4..b7dc655 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java @@ -172,7 +172,7 @@ String connectionField = addToAuditLogErrorMessage(connectionFailed, returnValue.get(connectionFailed), - connections); + connections, lun); printLog(log, connectionField, returnValue.get(connectionFailed)); } return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java index 5d3b09c..6f11631 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java @@ -127,8 +127,15 @@ protected String addToAuditLogErrorMessage(String connection, String errorCode, List<storage_server_connections> connections) { - String connectionField = getConnectionField(connections, connection); + return addToAuditLogErrorMessage(connection, errorCode, connections, null); + } + + protected String addToAuditLogErrorMessage(String connection, String errorCode, + List<storage_server_connections> connections, LUNs lun) { AuditLogableBase logable = new AuditLogableBase(); + + String connectionField = getConnectionField(connections, connection) + + (lun == null ? "" : " (LUN " + lun.getphysical_volume_id() + ")"); logable.AddCustomValue("Connection", connectionField); // Get translated error by error code ,if no translation found (should not happened) , -- To view, visit http://gerrit.ovirt.org/8028 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ba766c552a56940c4559b4cd73702627ff13eed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
