Daniel Erez has uploaded a new change for review. Change subject: core: live migrate - log error on failure ......................................................................
core: live migrate - log error on failure In case of shutting down the vm during snapshot creation part of live migrate, an appropriate failure AuditLog should be displayed (in addition, the error should be logged). Change-Id: Icae61b1c156e2bbb542a8790b310686028cc7a82 Bug-Url: https://bugzilla.redhat.com/957498 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/14440/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java index 98af7a2..59500ae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java @@ -96,7 +96,6 @@ @Override protected void endWithFailure() { super.endWithFailure(); - ExecutionHandler.setAsyncJob(getExecutionContext(), false); } private boolean isFirstTaskHandler() { @@ -111,6 +110,9 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: + if (!getParameters().getTaskGroupSuccess()) { + return AuditLogType.USER_MOVED_VM_DISK_FINISHED_FAILURE; + } if (isFirstTaskHandler() && getSucceeded()) { return AuditLogType.USER_MOVED_VM_DISK; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java index 025bcab..3ee80ef 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java @@ -10,10 +10,13 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.asynctasks.AsyncTaskType; +import org.ovirt.engine.core.utils.log.Log; +import org.ovirt.engine.core.utils.log.LogFactory; public class LiveMigrateDisksTaskHandler implements SPMAsyncTaskHandler { private final TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand; + private final Log log = LogFactory.getLog(getClass()); public LiveMigrateDisksTaskHandler(TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand) { this.enclosingCommand = enclosingCommand; @@ -32,6 +35,13 @@ commandContext); enclosingCommand.getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + + if (!parameters.getTaskGroupSuccess()) { + ExecutionHandler.endTaskJob(commandContext.getExecutionContext(), false); + log.errorFormat("Failed LiveMigrateDisk (Disk {0} , VM {1})", + parameters.getImageGroupID(), + parameters.getVmId()); + } } enclosingCommand.getReturnValue().setSucceeded(true); } -- To view, visit http://gerrit.ovirt.org/14440 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icae61b1c156e2bbb542a8790b310686028cc7a82 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
