Daniel Erez has uploaded a new change for review. Change subject: core: GetAllDisksBySD - fetch disks snapshots ......................................................................
core: GetAllDisksBySD - fetch disks snapshots GetAllDisksByStorageDomainIdQuery: fetch disks' snapshots for calculating actual size (DiskImage -> getActualDiskWithSnapshotsSize). Change-Id: I055e317ea21a9eabea126e9ca17af61db659cd10 Bug-Url: https://bugzilla.redhat.com/905595 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/dbscripts/disk_images_sp.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByStorageDomainIdQuery.java 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/11640/1 diff --git a/backend/manager/dbscripts/disk_images_sp.sql b/backend/manager/dbscripts/disk_images_sp.sql index 3d9220b..5d0228d 100644 --- a/backend/manager/dbscripts/disk_images_sp.sql +++ b/backend/manager/dbscripts/disk_images_sp.sql @@ -162,6 +162,7 @@ BEGIN RETURN QUERY SELECT images_storage_domain_view.* FROM images_storage_domain_view - WHERE images_storage_domain_view.storage_id = v_storage_id; + WHERE images_storage_domain_view.storage_id = v_storage_id + AND images_storage_domain_view.active = true; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByStorageDomainIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByStorageDomainIdQuery.java index 2fa1bb8..a3553df 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByStorageDomainIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByStorageDomainIdQuery.java @@ -1,5 +1,8 @@ package org.ovirt.engine.core.bll; +import java.util.List; + +import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase; public class GetAllDisksByStorageDomainIdQuery<P extends StorageDomainQueryParametersBase> extends QueriesCommandBase<P> { @@ -10,8 +13,16 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue( - getDbFacade().getDiskImageDao().getImagesByStorageId(getParameters().getStorageDomainId())); + List<DiskImage> diskImages = + getDbFacade().getDiskImageDao().getImagesByStorageId(getParameters().getStorageDomainId()); + for (DiskImage diskImage : diskImages) { + diskImage.getSnapshots().addAll(getAllImageSnapshots(diskImage)); + } + getQueryReturnValue().setReturnValue(diskImages); + } + + protected List<DiskImage> getAllImageSnapshots(DiskImage diskImage) { + return ImagesHandler.getAllImageSnapshots(diskImage.getImageId(), diskImage.getit_guid()); } } -- To view, visit http://gerrit.ovirt.org/11640 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I055e317ea21a9eabea126e9ca17af61db659cd10 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
