Daniel Erez has uploaded a new change for review. Change subject: core: import glance image - image locked on failure ......................................................................
core: import glance image - image locked on failure ImportRepoImageCreateTaskHandler: Ensure 'destinationImageId' member of 'ImagesActionsParametersBase' is saved in task parameters as part of AddImageFromScratch execution. This change is needed from retrieving 'destinationImageId' value in case of engine crash between tasks. Change-Id: I37eba72dabb17c5ff4c9edaca899f206440791d0 Bug-Url: https://bugzilla.redhat.com/1101541 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/28301/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index 15b1564..fd1eebc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -37,7 +37,9 @@ @Override protected void executeCommand() { setImageGroupId(getParameters().getDiskInfo().getId()); - setDestinationImageId(Guid.newGuid()); + if (Guid.isNullOrEmpty(getDestinationImageId())) { + setDestinationImageId(Guid.newGuid()); + } mNewCreatedDiskImage = new DiskImage(); mNewCreatedDiskImage.setImageId(getDestinationImageId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java index 47adab8..ae16895 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java @@ -37,6 +37,7 @@ public void execute() { if (enclosingCommand.getParameters().getTaskGroupSuccess()) { enclosingCommand.getParameters().setImageGroupID(Guid.newGuid()); + enclosingCommand.getParameters().setDestinationImageId(Guid.newGuid()); enclosingCommand.getParameters().setEntityInfo( new EntityInfo(VdcObjectType.Disk, enclosingCommand.getParameters().getImageGroupID())); @@ -94,6 +95,7 @@ parameters.setQuotaId(enclosingCommand.getParameters().getQuotaId()); parameters.setParentCommand(VdcActionType.ImportRepoImage); parameters.setParentParameters(enclosingCommand.getParameters()); + parameters.setDestinationImageId(enclosingCommand.getParameters().getDestinationImageId()); return parameters; } -- To view, visit http://gerrit.ovirt.org/28301 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37eba72dabb17c5ff4c9edaca899f206440791d0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
