Arik Hadas has uploaded a new change for review. Change subject: core: fix end with failure ......................................................................
core: fix end with failure Change-Id: I76445cf1bd5de5f8129d334d02ed15a415c06848 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java 1 file changed, 2 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/37672/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index 9eb96e6..110677b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -275,19 +275,9 @@ @Override protected void endWithFailure() { + getSnapshotDAO().removeMemoryFromActiveSnapshot(getVmId()); revertTasks(); - if (getVm().getRunOnVds() != null) { - getSnapshotDAO().removeMemoryFromActiveSnapshot(getVmId()); - setSucceeded(true); - } - - else { - log.warn( - "VM '{}' doesn't have 'run_on_vds' value - not clearing 'hibernation_vol_handle' info.", - getVm().getName()); - - getReturnValue().setEndActionTryAgain(false); - } + setSucceeded(true); } private VolumeType getMemoryVolumeType() { -- To view, visit http://gerrit.ovirt.org/37672 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76445cf1bd5de5f8129d334d02ed15a415c06848 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
