Tal Nisan has submitted this change and it was merged. 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 <laravot@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(-) Approvals: Tal Nisan: Looks good to me, approved Liron Aravot: Verified -- To view, visit http://gerrit.ovirt.org/36020 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf82438a9985b86b8f5412158f236628972c0f3f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: automation@ovirt.org