Browse Source

Merge "Remove old comments about caching scheduler compat"

changes/88/681188/1
Zuul 2 weeks ago
parent
commit
c4555f34ad
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      nova/scheduler/filter_scheduler.py

+ 6
- 5
nova/scheduler/filter_scheduler.py View File

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

Loading…
Cancel
Save