Eli Mesika has submitted this change and it was merged. Change subject: userportal : Fix DiskForVmGuid high CPU ...................................................................... userportal : Fix DiskForVmGuid high CPU In this patch we remove the need to load all disk data and just load the required information for the user portal. This patch was first committed and merged as http://gerrit.ovirt.org/#/c/16657/ and then reverted due to DAO tests failure. this commit has exactly the same changes as the original patch, the only change is in the TEST class, the problem was that the test checked the description field for NULL while it was set by the fixtures.xml to "New Description" Change-Id: I1d7369cfbfe9b7c6901bd1bc2e9c16bdc31a9af9 Bug URL: https://bugzilla.redhat.com/show_bug.cgi?id=971237 Signed-off-by: Eli Mesika <emesika(a)redhat.com&gt; --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksPartialDataByVmIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskDaoTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java M packaging/dbscripts/all_disks_sp.sql 7 files changed, 104 insertions(+), 11 deletions(-) Approvals: Eli Mesika: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/18268 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d7369cfbfe9b7c6901bd1bc2e9c16bdc31a9af9 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Liran Zelkha <liran.zelkha(a)gmail.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server