Allon Mureinik has submitted this change and it was merged. Change subject: core: handle Live Merge when top volume is larger than base ...................................................................... core: handle Live Merge when top volume is larger than base When a Live Merge is perfomed today, it internally performs a block commit operation to copy data from a volume to its parent. If the disk had been extended after the snapshot was created, the sizes of the two volumes will not match. In most cases the size is adjusted properly by the underlying processes performing the merge; to account for this, engine will update the size of the volume in the database to reflect the new, correct size. In the case of a raw volume on block storage, an explicit extension needs to take place before the merge. For this, a new child command of Live Merge has been added to run before the merge starts. For further detail, see comments to: https://bugzilla.redhat.com/show_bug.cgi?id=1232481 Change-Id: I628323b799a37691c40ea97590d4967f3ebf4a2b Bug-Url: https://bugzilla.redhat.com/1236758 Signed-off-by: Greg Padgett <gpadgett@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExtendImageSizeCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeExtendCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeExtendCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ExtendImageSizeParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveSnapshotSingleDiskLiveStep.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 7 files changed, 212 insertions(+), 3 deletions(-) Approvals: Greg Padgett: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/43025 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I628323b799a37691c40ea97590d4967f3ebf4a2b Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Adam Litke <alitke@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Ravi Nori <rnori@redhat.com> Gerrit-Reviewer: automation@ovirt.org