Liron Aravot has uploaded a new change for review. Change subject: core: prevent disks from remaining in locked status ......................................................................
core: prevent disks from remaining in locked status When disks are marked to remain in ILLEGAL status after failed creation they remain LOCKED because getRelevantDiskImage() retunrs null. As this patch is about to be backported to the 3.5 branch and it's preferred to keep the side effects to be minimal, in this patch i overload the setImageStatus method so that the disk will be passed to it. Change-Id: Iaf82438a9985b86b8f5412158f236628972c0f3f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1172130 Signed-off-by: Liron Aravot <lara...@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/BaseImagesCommand.java 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/36020/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 dde13b5..bb7e8a3 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 @@ -123,7 +123,7 @@ protected void endWithFailure() { if (getDestinationDiskImage() != null) { if (getParameters().isShouldRemainIllegalOnFailedExecution()) { - setImageStatus(ImageStatus.ILLEGAL); + setImageStatus(ImageStatus.ILLEGAL, getDestinationDiskImage()); } else { DbFacade.getInstance().getDiskImageDynamicDao().remove(getDestinationDiskImage().getImageId()); super.endWithFailure(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java index 5c90d3f..12ed193 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java @@ -307,7 +307,10 @@ } protected void setImageStatus(ImageStatus imageStatus) { - DiskImage diskImage = getRelevantDiskImage(); + setImageStatus(imageStatus, getRelevantDiskImage()); + } + + protected void setImageStatus(ImageStatus imageStatus, DiskImage diskImage) { if (diskImage != null && diskImage.getImageStatus() != imageStatus) { diskImage.setImageStatus(imageStatus); ImagesHandler.updateImageStatus(diskImage.getImage().getId(), imageStatus); -- To view, visit http://gerrit.ovirt.org/36020 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf82438a9985b86b8f5412158f236628972c0f3f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liron Aravot <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
