Gilad Chaplik has uploaded a new change for review. Change subject: core: scheduling: don't run externl scheduler on !empty data ......................................................................
core: scheduling: don't run externl scheduler on !empty data * Cluster policy contains external filters or weight modules. * All hosts filtered out in internal filtering. Change-Id: Ib77bb37590153802939bc1e2d2a9a5ee198fbce6 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/18565/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 c04817a..f26fbc0 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 @@ -340,7 +340,8 @@ hostList = runInternalFilters(internalFilters, hostList, vm, parameters, filterPositionMap, messages, memoryChecker); - if (Config.GetValue(ConfigValues.ExternalSchedulerEnabled)){ + if (Config.<Boolean> GetValue(ConfigValues.ExternalSchedulerEnabled) && externalFilters.size() > 0 + && hostList != null && hostList.size() > 0) { hostList = runExternalFilters(externalFilters, hostList, vm, parameters, messages); } @@ -443,7 +444,7 @@ Map<Guid, Integer> hostCostTable = runInternalFunctions(internalScoreFunctions, hostList, vm, parameters); - if (Config.GetValue(ConfigValues.ExternalSchedulerEnabled)) { + if (Config.<Boolean> GetValue(ConfigValues.ExternalSchedulerEnabled) && externalScoreFunctions.size() > 0) { runExternalFunctions(externalScoreFunctions, hostList, vm, parameters, hostCostTable); } Entry<Guid, Integer> bestHostEntry = null; -- To view, visit http://gerrit.ovirt.org/18565 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib77bb37590153802939bc1e2d2a9a5ee198fbce6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches