Daniel Erez has uploaded a new change for review. Change subject: core: VmReplicateDiskStart - catch exception on revertTask ......................................................................
core: VmReplicateDiskStart - catch exception on revertTask VmReplicateDiskStartTaskHandler: catching exception on 'revertTask' in order to ensure disk status update (unlock the disk) and to prevent further rollback. Change-Id: I50dfae1e3903e6fabb8e8f17c9251977d7b2c874 Bug-Url: https://bugzilla.redhat.com/970889 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/16797/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java index 81ddf22..c357dee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskStartTaskHandler.java @@ -76,9 +76,13 @@ getEnclosingCommand().getParameters().getDestinationImageId() ); - VDSReturnValue ret = - ResourceManager.getInstance().runVdsCommand(VDSCommandType.VmReplicateDiskFinish, migrationStartParams); - if (!ret.getSucceeded()) { + try { + VDSReturnValue ret = ResourceManager.getInstance().runVdsCommand( + VDSCommandType.VmReplicateDiskFinish, migrationStartParams); + if (!ret.getSucceeded()) { + getEnclosingCommand().preventRollback(); + } + } catch (RuntimeException e) { getEnclosingCommand().preventRollback(); } } -- To view, visit http://gerrit.ovirt.org/16797 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50dfae1e3903e6fabb8e8f17c9251977d7b2c874 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
