Liran Zelkha has posted comments on this change.
Change subject: userportal : Fix DiskForVmGuid high CPU
......................................................................
Patch Set 1: (7 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksPartialDataByVmIdQuery.java
Line 21: protected void executeQueryCommand() {
Line 22: List<Disk> allDisks =
Line 23: getDbFacade().getDiskDao().getAllForVmPartialData
Line 24: (getParameters().getId(), false, getUserID(),
getParameters().isFiltered());
Line 25: // Set<Guid> pluggedDiskIds = getPluggedDiskIds();
Done
Line 26: // List<Disk> disks = new ArrayList<Disk>(allDisks);
Line 27: // for (Disk disk : allDisks) {
Line 28: // disk.setPlugged(pluggedDiskIds.contains(disk.getId()));
Line 29: // if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
Line 31: //
diskImage.getSnapshots().addAll(getAllImageSnapshots(diskImage));
Line 32: // }
Line 33: // }
Line 34: // getQueryReturnValue().setReturnValue(disks);
Line 35: getQueryReturnValue().setReturnValue(allDisks);
Only for extended view. We only use this method for basic view.
Line 36: }
Line 37:
Line 38: protected List<DiskImage> getAllImageSnapshots(DiskImage
diskImage) {
Line 39: return
ImagesHandler.getAllImageSnapshots(diskImage.getImageId(),
diskImage.getImageTemplateId());
Line 34: // getQueryReturnValue().setReturnValue(disks);
Line 35: getQueryReturnValue().setReturnValue(allDisks);
Line 36: }
Line 37:
Line 38: protected List<DiskImage> getAllImageSnapshots(DiskImage
diskImage) {
Done
Line 39: return
ImagesHandler.getAllImageSnapshots(diskImage.getImageId(),
diskImage.getImageTemplateId());
Line 40: }
Line 41:
Line 42: private Set<Guid> getPluggedDiskIds() {
Line 38: protected List<DiskImage> getAllImageSnapshots(DiskImage
diskImage) {
Line 39: return
ImagesHandler.getAllImageSnapshots(diskImage.getImageId(),
diskImage.getImageTemplateId());
Line 40: }
Line 41:
Line 42: private Set<Guid> getPluggedDiskIds() {
Done
Line 43: List<VmDevice> disksVmDevices =
Line 44: getDbFacade().getVmDeviceDao()
Line 45:
.getVmDeviceByVmIdTypeAndDevice(getParameters().getId(),
Line 46: VmDeviceGeneralType.DISK,
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageBasicView.java
Line 6: import org.ovirt.engine.core.common.validation.group.CreateEntity;
Line 7: import org.ovirt.engine.core.common.validation.group.UpdateEntity;
Line 8: import org.ovirt.engine.core.compat.Guid;
Line 9:
Line 10: public class DiskImageBasicView extends DiskImage {
Done
Line 11: private static final long serialVersionUID = -1662959000228929684L;
Line 12:
Line 13: public DiskImageBasicView() {
Line 14: super();
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java
Line 46: public void onSuccess(Object model, Object ReturnValue)
Line 47: {
Line 48: List<DiskImageBasicView> disks =
Line 49: (List<DiskImageBasicView>)
((VdcQueryReturnValue) ReturnValue).getReturnValue();
Line 50: ArrayList<DiskImageBasicView> diskList = new
ArrayList<DiskImageBasicView>();
Done
Line 51: diskList.addAll(disks);
Line 52: Collections.sort(diskList, new
Linq.DiskByAliasComparer());
Line 53:
Line 54: SearchableListModel searchableListModel =
(SearchableListModel) model;
....................................................
File packaging/dbscripts/all_disks_sp.sql
Line 57: Create or replace FUNCTION GetDisks_VmGuid_BasicView(v_vm_guid UUID,
v_only_plugged BOOLEAN, v_user_id UUID, v_is_filtered BOOLEAN)
Line 58: RETURNS SETOF GetDisks_VmGuid_BasicView_rs
Line 59: AS $procedure$
Line 60: BEGIN
Line 61: RETURN QUERY
Done
Line 62: select disk_id,disk_alias, size
Line 63: from images
Line 64: LEFT OUTER JOIN base_disks ON images.image_group_id =
base_disks.disk_id
Line 65: LEFT JOIN vm_device ON vm_device.device_id =
image_group_id AND (NOT v_only_plugged OR is_plugged)
--
To view, visit http://gerrit.ovirt.org/16657
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Iceb6e518936f65403561703e6b70920fbcc1f07c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liran Zelkha <[email protected]>
Gerrit-Reviewer: Allon Mureinik <[email protected]>
Gerrit-Reviewer: Daniel Erez <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Liran Zelkha <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
