Maor Lipchuk has uploaded a new change for review. Change subject: core:Direct lun disk should only log finish action ......................................................................
core:Direct lun disk should only log finish action Direct lun disk should only log it finished the action since there is no use of tasks in the process. Change-Id: I22b145fbc12481e40eaa8329eb8ce35f7c39a320 Bug-Url: https://bugzilla.redhat.com/910693 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java 2 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/12011/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index ea5060b..a8e164c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -439,8 +439,11 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: - return getExecuteAuditLogTypeValue(getSucceeded()); - + if (getParameters().getDiskInfo().getDiskStorageType() == DiskStorageType.IMAGE) { + return getExecuteAuditLogTypeValue(getSucceeded()); + } else { + return getEndSuccessAuditLogTypeValue(getSucceeded()); + } case END_SUCCESS: return getEndSuccessAuditLogTypeValue(getSucceeded()); @@ -511,6 +514,18 @@ return null; } + @Override + protected void endSuccessfully() { + super.endSuccessfully(); + setCommandShouldBeLogged(true); + } + + @Override + protected void endWithFailure() { + super.endWithFailure(); + setCommandShouldBeLogged(true); + } + private Guid getQuotaId() { if (getParameters().getDiskInfo() != null && DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 161b18e..dc28566 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -336,7 +336,12 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: - return getSucceeded() ? AuditLogType.USER_REMOVE_DISK : AuditLogType.USER_FAILED_REMOVE_DISK; + if (getDisk().getDiskStorageType() == DiskStorageType.IMAGE) { + return getSucceeded() ? AuditLogType.USER_REMOVE_DISK : AuditLogType.USER_FAILED_REMOVE_DISK; + } else { + return getSucceeded() ? AuditLogType.USER_FINISHED_REMOVE_DISK + : AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK; + } case END_SUCCESS: return AuditLogType.USER_FINISHED_REMOVE_DISK; default: -- To view, visit http://gerrit.ovirt.org/12011 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22b145fbc12481e40eaa8329eb8ce35f7c39a320 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
