Martin Sivák has submitted this change and it was merged. Change subject: scheduling: Fix CpuAndMemoryBalancingPolicyUnit ...................................................................... scheduling: Fix CpuAndMemoryBalancingPolicyUnit The unit considers CPU usage to choose VM for migration. Function VmDao.getAllRunningForVds() does not return VM with VmStatistics anymore. This patch fixes NPE caused by the missing VmStatistics. Change-Id: Iabad0025c4964790628c69b9a1c534adf843feaf Signed-off-by: Andrej Krejcir <akrejcir@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuAndMemoryBalancingPolicyUnit.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/FindVmAndDestinations.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuAndMemoryBalancingPolicyUnitTest.java 3 files changed, 69 insertions(+), 50 deletions(-) Approvals: Martin Sivák: Looks good to me, approved Jenkins CI: Passed CI tests Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/64950 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabad0025c4964790628c69b9a1c534adf843feaf Gerrit-PatchSet: 12 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir@redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar@redhat.com> Gerrit-Reviewer: Martin Sivák <msivak@redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey@redhat.com> Gerrit-Reviewer: Roman Mohr <rmohr@redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>