Allon Mureinik has submitted this change and it was merged. Change subject: core: introduce RemoveSnapshotSingleDiskLive BLL command ...................................................................... core: introduce RemoveSnapshotSingleDiskLive BLL command RemoveSnapshotCommand now has the capability to run RemoveSnapshotSingleDiskLiveCommand for merging snapshots while a VM is running. This new command uses the CommandExecutor framework, and runs 3 child commands: Merge, MergeStatus, and DestroyImage. MergeCommand starts a merge job on the host running the VM. VDSM will report the job to us in vmStats until it completes, at which time MergeCommand is considered finished. MergeStatusCommand will then run to determine whether the merge was successful, along with discovering the merge direction chosen by vdsm. This is done by querying the VM's current volume chain. DestroyImageCommand then removes all the now-orphaned images left behind by the merge operation. After the children have all finished successfully, endVmCommand on RemoveSnapshotSingleDiskLiveCommand updates the database records to reflect the new post-merge volume chain. Change-Id: Ic47eb91a0ea1fe150e3b2152e2c9d5f1f2eb3678 Bug-Url: https://bugzilla.redhat.com/1058160 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com&gt; --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommandBase.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandTest.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeStatusReturnValue.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveSnapshotParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveSnapshotSingleDiskLiveStep.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveSnapshotSingleDiskParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VMStatus.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java 25 files changed, 1,125 insertions(+), 81 deletions(-) Approvals: Greg Padgett: Verified Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/26909 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic47eb91a0ea1fe150e3b2152e2c9d5f1f2eb3678 Gerrit-PatchSet: 21 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt; Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt; Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server