Gilad Chaplik has uploaded a new change for review. Change subject: core: scheduling: fixups ......................................................................
core: scheduling: fixups - Remove unused method - List.contains() was comparing VDS and Guid wrongfully Change-Id: I9b645459ecdca96bf19fccadab551be7f4b00f3f Bug-Url: https://bugzilla.redhat.com/1007282 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java 1 file changed, 8 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/20148/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java index 3fc0d49..4f72cfa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java @@ -191,8 +191,14 @@ if (vdsList == null || vdsList.size() == 0) { return null; } - if (vdsList != null && vdsList.contains(destHostId)) { - return destHostId; + // in case a default destination host was specified, and + // it passed filters return it + if (destHostId != null) { + for (VDS vds : vdsList) { + if (destHostId.equals(vds.getId())) { + return destHostId; + } + } } if (policy.getFunctions() == null || policy.getFunctions().isEmpty()) { return vdsList.get(0).getId(); @@ -237,32 +243,6 @@ return false; } return true; - } - - protected boolean checkDestinationHost(VM vm, - List<VDS> vdsList, - Guid destVdsId, - List<String> messages, - ClusterPolicy policy, - Map<String, String> parameters, - VdsFreeMemoryChecker memoryChecker) { - List<VDS> destVdsList = new ArrayList<VDS>(); - for (VDS vds : vdsList) { - if (vds.getId().equals(destVdsId)) { - destVdsList.add(vds); - break; - } - } - destVdsList = - runFilters(policy.getFilters(), - destVdsList, - vm, - parameters, - policy.getFilterPositionMap(), - messages, - memoryChecker); - - return destVdsList != null && destVdsList.size() == 1; } static List<Guid> getEntityIds(List<? extends BusinessEntity<Guid>> entities) { -- To view, visit http://gerrit.ovirt.org/20148 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b645459ecdca96bf19fccadab551be7f4b00f3f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
