ofri masad has uploaded a new change for review. Change subject: backend: Fix calc of snapshot quota (#848028) ......................................................................
backend: Fix calc of snapshot quota (#848028) https://bugzilla.redhat.com/848028 Fix 1: The sized used for quota calculation of each snapshot was fixed. The former value was the size of the predefined disk, the new value is the actual size the snapshot took in storage. Fix 2: The snapshot-preview did not pass the quota ID to the new active image. After the commit, the active image was linked to a null qouta and so a new snapshot could not be taken. Change-Id: I6cf5d23a9c5c90b64b330cadf4f7c1b67fad45fa Signed-off-by: Ofri Masad <oma...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/7338/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 5c9c3bb..2ac17fc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -310,7 +310,7 @@ : getVm().getQuotaId(), //TODO: shared disk? disk.getstorage_ids().get(0), - disk.getSizeInGigabytes())); + disk.getActualSize())); } return list; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 6131c8d..050fd3c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -136,6 +136,7 @@ tempVar.setVmSnapshotId(newActiveSnapshotId); tempVar.setEntityId(getParameters().getEntityId()); tempVar.setParentParemeters(getParameters()); + tempVar.setQuotaId(image.getQuotaId()); ImagesContainterParametersBase p = tempVar; VdcReturnValueBase vdcReturnValue = Backend.getInstance().runInternalAction(VdcActionType.TryBackToSnapshot, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java index 40f1b4d..9558db4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java @@ -307,6 +307,11 @@ private double actualSize; + /** + * Get the actual Size of the DiskImage in GB. + * The actual size is the size the DiskImage actually occupies on storage. + * @return - Actual size used by this DiskImage in GB + */ public double getActualSize() { return actualSize; } -- To view, visit http://gerrit.ovirt.org/7338 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cf5d23a9c5c90b64b330cadf4f7c1b67fad45fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
