Reviewed: https://review.openstack.org/539738 Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=02a1551f6455792ee050d6009c94514402b7df04 Submitter: Zuul Branch: master
commit 02a1551f6455792ee050d6009c94514402b7df04 Author: Eric Fried <[email protected]> Date: Wed Jan 31 18:06:17 2018 -0600 Ensure resource classes correctly Previously, SchedulerReportClient.set_inventory_for_provider used this logic to pre-create custom resource classes found in the input inventory. list(map(self._ensure_resource_class, (rc_name for rc_name in inv_data if rc_name not in fields.ResourceClass.STANDARD))) ...where _ensure_resource_class would always attempt to create the resource class it was given, and raise an exception if that failed for any reason. Note in particular that attempting to create an already-extant "standard" resource class will fail just the same as attempting to create any nonexistent resource class that doesn't conform to the schema (i.e. beginning with "CUSTOM_"). The problem is that this relies on the local system's notion of the set of standard resource classes. If the placement service is running newer code, standard resource classes may have been added that the compute service doesn't know about yet. This change set solves the problem by only attempting to create resource classes with the 'CUSTOM_' prefix. self._ensure_resource_class (which worked on a single resource class) is replaced with self._ensure_resource_classes (plural) which accepts a list of *all* the desired resource classes (including the standard ones), filters down to the CUSTOM_* ones, and attempts to create the remainder. Note that if placement ever decides to start allowing creation of resource classes with prefixes other than CUSTOM_, it will have to do so under a new microversion, so we can't future-proof this by e.g. prefetching all the known resource classes from placement and attempting to create any not found in that list. In the process of doing this rework, obsolete code paths relying on pre-1.7 placement microversions are removed. Change-Id: I600ed262e1b5d11facbf461e28291193665280cf Closes-Bug: #1746615 ** Changed in: nova Status: In Progress => Fix Released -- You received this bug notification because you are a member of Yahoo! Engineering Team, which is subscribed to OpenStack Compute (nova). https://bugs.launchpad.net/bugs/1746615 Title: Report client can try to ensure a standard resource class Status in OpenStack Compute (nova): Fix Released Bug description: SchedulerReportClient.set_inventory_for_provider uses this logic [1] to pre-create custom resource classes found in the input inventory. list(map(self._ensure_resource_class, (rc_name for rc_name in inv_data if rc_name not in fields.ResourceClass.STANDARD))) The problem is that this relies on the local system's notion of the set of standard resource classes. If the placement service is running newer code, standard resource classes may have been added that the compute service doesn't know about yet. If a consumer attempts to use such a resource class, the above block will attempt to _ensure_resource_class on it, which attempts to create it in placement, which results in a 400 (because the schema requires it to begin with CUSTOM_), which results in InvalidResourceClass exception, and the consumer can't use that resource class. We should never be relying on placement code directly on the compute node. (This includes introspecting os-traits.) We should always be asking the placement service. [1] https://github.com/openstack/nova/blob/894dd5b87674d396c7221f9d1bca3a9a983dfeb8/nova/scheduler/client/report.py#L983-L985 To manage notifications about this bug go to: https://bugs.launchpad.net/nova/+bug/1746615/+subscriptions -- Mailing list: https://launchpad.net/~yahoo-eng-team Post to : [email protected] Unsubscribe : https://launchpad.net/~yahoo-eng-team More help : https://help.launchpad.net/ListHelp
