Eli Mesika has uploaded a new change for review. Change subject: core:no task id in engine log for revert task ......................................................................
core:no task id in engine log for revert task This patch write to the log when a task is reverted by the compensation mechanism the task type and also the task id. Change-Id: Ie6a1dbeadfb512bbed81c3d2fa7e18ee4a997d92 Signed-off-by: Eli Mesika <emes...@redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=878943 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 2 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/10804/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java index e2c0aa4..7e4ba98 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java @@ -37,7 +37,7 @@ getReturnValue().setSucceeded(false); beforeTask(); addTask(Backend.getInstance().getResourceManager() - .RunVdsCommand(getVDSCommandType(), getVDSParameters())); + .RunVdsCommand(getVDSCommandType(), getVDSParameters()), false); } ExecutionHandler.setAsyncJob(getEnclosingCommand().getExecutionContext(), true); getReturnValue().setSucceeded(true); @@ -49,11 +49,11 @@ VDSCommandType revertCommandType = getRevertVDSCommandType(); if (revertCommandType != null) { addTask(Backend.getInstance().getResourceManager() - .RunVdsCommand(getRevertVDSCommandType(), getRevertVDSParameters())); + .RunVdsCommand(getRevertVDSCommandType(), getRevertVDSParameters()), true); } } - private void addTask(VDSReturnValue vdsReturnValue) { + private void addTask(VDSReturnValue vdsReturnValue, boolean isRevertedTask) { AsyncTaskCreationInfo taskCreationInfo = vdsReturnValue.getCreationInfo(); getReturnValue().getInternalTaskIdList().add(cmd.createTask( taskCreationInfo, @@ -61,7 +61,11 @@ getTaskObjectType(), getTaskObjects()) ); - getReturnValue().getTaskIdList().add(taskCreationInfo.getTaskID()); + Guid taskId = taskCreationInfo.getTaskID(); + getReturnValue().getTaskIdList().add(taskId); + if (isRevertedTask) { + log.infoFormat("Reverted task ID is {0}.", taskId); + } } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 9b120f7..ec092b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -590,7 +590,7 @@ private void revertPreviousHandlers() { getParameters().decrementExecutionIndex(); if (getExecutionIndex() >= 0) { - log.errorFormat("Reverting task handler: {0}", getCurrentTaskHandler().getClass().getName()); + log.errorFormat("Reverting task {0}, handler: {1}", getCurrentTaskHandler().getRevertTaskType(), getCurrentTaskHandler().getClass().getName()); getParameters().setExecutionReason(CommandExecutionReason.ROLLBACK_FLOW); getCurrentTaskHandler().compensate(); -- To view, visit http://gerrit.ovirt.org/10804 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6a1dbeadfb512bbed81c3d2fa7e18ee4a997d92 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
