Liron Aravot has uploaded a new change for review. Change subject: MoveOrCopyImageGroup - perform unlock when neccessary. ......................................................................
MoveOrCopyImageGroup - perform unlock when neccessary. When attempting to revert by executing RemoveImage, there's no need to unlock the image. Reasons: 1. It's going to be removed by RemoveImage. 2. The transaction isn't ended when calling RemoveImage, which attempts to update the same db record, causing to a deadlock. Change-Id: I3ea9bccb7e1a055613bb9a86d77e784e29f94bc5 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/11328/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java index d7c83ae..99229fb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java @@ -173,7 +173,6 @@ @Override protected void endWithFailure() { - unLockImage(); if (getMoveOrCopyImageOperation() == ImageOperation.Copy) { if (getParameters().getAddImageDomainMapping()) { // remove image-storage mapping @@ -182,6 +181,8 @@ getParameters().getStorageDomainId())); } revertTasks(); + } else { + unLockImage(); } setSucceeded(true); } @@ -204,6 +205,8 @@ // which adds the taskId on the internal task ID list startPollingAsyncTasks(returnValue.getInternalTaskIdList()); } + } else { + unLockImage(); } } -- To view, visit http://gerrit.ovirt.org/11328 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ea9bccb7e1a055613bb9a86d77e784e29f94bc5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
