diff --git a/doc/source/contributor/testing/eventlet-profiling.rst b/doc/source/contributor/testing/eventlet-profiling.rst index 7cc389c636bd..2804f40ccc53 100644 --- a/doc/source/contributor/testing/eventlet-profiling.rst +++ b/doc/source/contributor/testing/eventlet-profiling.rst @@ -266,7 +266,7 @@ The creation of this caveat section was inspired by issues experienced while profiling ``nova-compute``. The ``nova-compute`` process is not allowed to speak with a database server directly. Instead communication is mediated through the conductor, communication happening via ``oslo.versionedobjects`` -and remote calls. Profiling methods such as ``_update_available_resources`` in +and remote calls. Profiling methods such as ``update_available_resource`` in the ResourceTracker, which needs information from the database, results in profile data that can be analyzed but is incorrect and misleading. diff --git a/nova/conf/compute.py b/nova/conf/compute.py index 5da7d9f694fa..e2b7b83311be 100644 --- a/nova/conf/compute.py +++ b/nova/conf/compute.py @@ -1150,7 +1150,7 @@ Related options: help=""" Interval for updating compute resources. -This option specifies how often the update_available_resources +This option specifies how often the update_available_resource periodic task should run. A number less than 0 means to disable the task completely. Leaving this at the default of 0 will cause this to run at the default periodic interval. Setting it to any positive diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 83a8ac720c27..e926629c955e 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -586,7 +586,7 @@ class IronicDriver(virt_driver.ComputeDriver): extra_specs. Since existing ironic instances will not have this in their extra_specs, they will only have allocations against VCPU/RAM/disk. By adding just the custom RC to the existing flavor - extra_specs, the periodic call to update_available_resources() will add + extra_specs, the periodic call to update_available_resource() will add an allocation against the custom resource class, and prevent placement from thinking that node is available. This code can be removed in Queens, and will need to be updated to also alter extra_specs to