Liron Aravot has uploaded a new change for review. Change subject: core: domain might remain locked on deactivation ......................................................................
core: domain might remain locked on deactivation When passing the compensation context to the child command the 'recorded' changes aren't reverted becasue when attempting to load the compensation data the load is by the command id which is different between the parent command and the child command. When no tasks are created when deactivating domain and the actual deactivation fails, the domain remained locked because of the above reason. Change-Id: I4a1bea6522ceb8c83be9466ed50748559745c3c8 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainWithOvfUpdateCommand.java 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/37201/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainWithOvfUpdateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainWithOvfUpdateCommand.java index 6f39232..d6afc37 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainWithOvfUpdateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainWithOvfUpdateCommand.java @@ -66,12 +66,11 @@ } if (getReturnValue().getVdsmTaskIdList().isEmpty()) { - executeDeactivateCommand(true); + setSucceeded(executeDeactivateCommand(true)); } else { setCommandShouldBeLogged(false); + setSucceeded(true); } - - setSucceeded(true); } protected boolean shouldPerformOvfUpdate() { @@ -159,7 +158,7 @@ params.setSkipChecks(true); params.setSkipLock(true); params.setShouldBeLogged(true); - CommandContext context = passContext ? cloneContext() : null; + CommandContext context = passContext ? cloneContext().withoutCompensationContext() : null; return getBackend().runInternalAction(VdcActionType.DeactivateStorageDomain, params, context).getSucceeded(); } -- To view, visit http://gerrit.ovirt.org/37201 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a1bea6522ceb8c83be9466ed50748559745c3c8 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
