Vered Volansky has uploaded a new change for review. Change subject: core: regression, Changed err message ......................................................................
core: regression, Changed err message Longer description using lines' length under 72 chars. With multiple paragraphs if necessary. Change-Id: I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/8693/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index ae9a158..bd3e98e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -339,8 +339,7 @@ // the stateless VM in the EndAction part. VmHandler.updateDisksFromDb(getVm()); } else { - if (vdcReturnValue.getCanDoActionMessages().contains( - VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ARE_LOCKED.name())) { + if (areDisksLocked(vdcReturnValue)) { throw new VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL); } getReturnValue().setFault(vdcReturnValue.getFault()); @@ -349,6 +348,17 @@ } } + protected boolean areDisksLocked(VdcReturnValueBase vdcReturnValue) { + if (vdcReturnValue.getCanDoActionMessages().contains( + VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ARE_LOCKED.name())) { + return true; + } + + return vdcReturnValue.getCanDoActionMessages().contains( + VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_LOCKED.name()); + + } + private void warnIfNotAllDisksPermitSnapshots() { for (Disk disk : getVm().getDiskMap().values()) { if (!disk.isAllowSnapshot()) { -- To view, visit http://gerrit.ovirt.org/8693 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
