openstack
/
nova
Code Issues Proposed changes

Merge "Remove old comments about caching scheduler compat"

This commit is contained in:
Zuul 2019-09-06 23:28:32 +00:00 committed by Gerrit Code Review
parent e25f3e31c5 d11a335ea5
commit c4555f34ad
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/scheduler/filter_scheduler.py
View File

@ -173,10 +173,10 @@ class FilterScheduler(driver.Scheduler):
if (instance_uuids is None or if (instance_uuids is None or
not self.USES_ALLOCATION_CANDIDATES or not self.USES_ALLOCATION_CANDIDATES or
alloc_reqs_by_rp_uuid is None): alloc_reqs_by_rp_uuid is None):
# We need to support the caching scheduler, which doesn't use the # We still support external scheduler drivers that don't use the
# placement API (and has USES_ALLOCATION_CANDIDATE = False) and # placement API (and set USES_ALLOCATION_CANDIDATE = False) and
# therefore we skip all the claiming logic for that scheduler # therefore we skip all the claiming logic for those scheduler
# driver. Also, if there was a problem communicating with the # drivers. Also, if there was a problem communicating with the
# placement API, alloc_reqs_by_rp_uuid will be None, so we skip # placement API, alloc_reqs_by_rp_uuid will be None, so we skip
# claiming in that case as well. In the case where instance_uuids # claiming in that case as well. In the case where instance_uuids
# is None, that indicates an older conductor, so we need to return # is None, that indicates an older conductor, so we need to return
@ -479,7 +479,8 @@ class FilterScheduler(driver.Scheduler):
"""Template method, so a subclass can implement caching.""" """Template method, so a subclass can implement caching."""
# NOTE(jaypipes): provider_summaries being None is treated differently # NOTE(jaypipes): provider_summaries being None is treated differently
# from an empty dict. provider_summaries is None when we want to grab # from an empty dict. provider_summaries is None when we want to grab
# all compute nodes, for instance when using the caching scheduler. # all compute nodes, for instance when using a scheduler driver that
# sets USES_ALLOCATION_CANDIDATES=False.
# The provider_summaries variable will be an empty dict when the # The provider_summaries variable will be an empty dict when the
# Placement API found no providers that match the requested # Placement API found no providers that match the requested
# constraints, which in turn makes compute_uuids an empty list and # constraints, which in turn makes compute_uuids an empty list and