Merge "Remove deprecated scheduler filters"

Author: Zuul

doc/source/admin/aggregates.rst

@@ -336,14 +336,11 @@ related availability zones feature operate under the hood:
 Finally, as discussed previously, there are a number of host aggregate-specific
 scheduler filters. These are:
 
-- :ref:`AggregateCoreFilter`
-- :ref:`AggregateDiskFilter`
 - :ref:`AggregateImagePropertiesIsolation`
 - :ref:`AggregateInstanceExtraSpecsFilter`
 - :ref:`AggregateIoOpsFilter`
 - :ref:`AggregateMultiTenancyIsolation`
 - :ref:`AggregateNumInstancesFilter`
-- :ref:`AggregateRamFilter`
 - :ref:`AggregateTypeAffinityFilter`
 
 The following configuration options are applicable to the scheduler

doc/source/admin/configuration/schedulers.rst

@@ -158,68 +158,6 @@ Compute filters
 
 The following sections describe the available compute filters.
 
-.. _AggregateCoreFilter:
-
-AggregateCoreFilter
--------------------
-
-.. deprecated:: 20.0.0
-
-  ``AggregateCoreFilter`` is deprecated since the 20.0.0 Train release.
-  As of the introduction of the placement service in Ocata, the behavior
-  of this filter :ref:`has changed <bug-1804125>` and no longer should be used.
-  In the 18.0.0 Rocky release nova `automatically mirrors`_ host aggregates
-  to placement aggregates.
-  In the 19.0.0 Stein release initial allocation ratios support was added
-  which allows management of the allocation ratios via the placement API in
-  addition to the existing capability to manage allocation ratios via the nova
-  config. See `Allocation ratios`_ for details.
-
-.. _`automatically mirrors`: https://specs.openstack.org/openstack/nova-specs/specs/rocky/implemented/placement-mirror-host-aggregates.html
-
-Filters host by CPU core count with a per-aggregate ``cpu_allocation_ratio``
-value. If the per-aggregate value is not found, the value falls back to the
-global setting.  If the host is in more than one aggregate and more than one
-value is found, the minimum value will be used.
-
-Refer to :doc:`/admin/aggregates` for more information.
-
-.. important::
-
-     Note the ``cpu_allocation_ratio`` :ref:`bug 1804125 <bug-1804125>`
-     restriction.
-
-
-.. _AggregateDiskFilter:
-
-AggregateDiskFilter
--------------------
-
-.. deprecated:: 20.0.0
-
-  ``AggregateDiskFilter`` is deprecated since the 20.0.0 Train release.
-  As of the introduction of the placement service in Ocata, the behavior
-  of this filter :ref:`has changed <bug-1804125>` and no longer should be used.
-  In the 18.0.0 Rocky release nova `automatically mirrors`_ host aggregates
-  to placement aggregates.
-  In the 19.0.0 Stein release initial allocation ratios support was added
-  which allows management of the allocation ratios via the placement API in
-  addition to the existing capability to manage allocation ratios via the nova
-  config. See `Allocation ratios`_ for details.
-
-Filters host by disk allocation with a per-aggregate ``disk_allocation_ratio``
-value. If the per-aggregate value is not found, the value falls back to the
-global setting.  If the host is in more than one aggregate and more than one
-value is found, the minimum value will be used.
-
-Refer to :doc:`/admin/aggregates` for more information.
-
-.. important::
-
-    Note the ``disk_allocation_ratio`` :ref:`bug 1804125 <bug-1804125>`
-    restriction.
-
-
 .. _AggregateImagePropertiesIsolation:
 
 AggregateImagePropertiesIsolation
@@ -370,37 +308,6 @@ Refer to :doc:`/admin/aggregates` and :ref:`NumInstancesFilter` for more
 information.
 
 
-.. _AggregateRamFilter:
-
-AggregateRamFilter
-------------------
-
-.. deprecated:: 20.0.0
-
-  ``AggregateRamFilter`` is deprecated since the 20.0.0 Train release.
-  As of the introduction of the placement service in Ocata, the behavior
-  of this filter :ref:`has changed <bug-1804125>` and no longer should be used.
-  In the 18.0.0 Rocky release nova `automatically mirrors`_ host aggregates
-  to placement aggregates.
-  In the 19.0.0 Stein release initial allocation ratios support was added
-  which allows management of the allocation ratios via the placement API in
-  addition to the existing capability to manage allocation ratios via the nova
-  config. See `Allocation ratios`_ for details.
-
-Filters host by RAM allocation of instances with a per-aggregate
-``ram_allocation_ratio`` value. If the per-aggregate value is not found, the
-value falls back to the global setting.  If the host is in more than one
-aggregate and thus more than one value is found, the minimum value will be
-used.
-
-Refer to :doc:`/admin/aggregates` for more information.
-
-.. important::
-
-    Note the ``ram_allocation_ratio`` :ref:`bug 1804125 <bug-1804125>`
-    restriction.
-
-
 .. _AggregateTypeAffinityFilter:
 
 AggregateTypeAffinityFilter
@@ -689,26 +596,6 @@ PciPassthroughFilter
 The filter schedules instances on a host if the host has devices that meet the
 device requests in the ``extra_specs`` attribute for the flavor.
 
-RetryFilter
------------
-
-.. deprecated:: 20.0.0
-
-   Since the 17.0.0 (Queens) release, the scheduler has provided alternate
-   hosts for rescheduling so the scheduler does not need to be called during
-   a reschedule which makes the ``RetryFilter`` useless. See the
-   `Return Alternate Hosts`_ spec for details.
-
-Filters out hosts that have already been attempted for scheduling purposes.  If
-the scheduler selects a host to respond to a service request, and the host
-fails to respond to the request, this filter prevents the scheduler from
-retrying that host for the service request.
-
-This filter is only useful if the :oslo.config:option:`scheduler.max_attempts`
-configuration option is set to a value greater than one.
-
-.. _Return Alternate Hosts: https://specs.openstack.org/openstack/nova-specs/specs/queens/implemented/return-alternate-hosts.html
-
 SameHostFilter
 --------------
 
@@ -1012,23 +899,6 @@ The allocation ratio configuration is used both during reporting of compute
 node `resource provider inventory`_ to the placement service and during
 scheduling.
 
-.. _bug-1804125:
-
-.. note:: Regarding the `AggregateCoreFilter`_, `AggregateDiskFilter`_ and
-   `AggregateRamFilter`_, starting in 15.0.0 (Ocata) there is a behavior
-   change where aggregate-based overcommit ratios will no longer be honored
-   during scheduling for the FilterScheduler. Instead, overcommit values must
-   be set on a per-compute-node basis in the Nova configuration files.
-
-   If you have been relying on per-aggregate overcommit, during your upgrade,
-   you must change to using per-compute-node overcommit ratios in order for
-   your scheduling behavior to stay consistent. Otherwise, you may notice
-   increased NoValidHost scheduling failures as the aggregate-based overcommit
-   is no longer being considered.
-
-   See `bug 1804125 <https://bugs.launchpad.net/nova/+bug/1804125>`_ for more
-   details.
-
 .. _resource provider inventory: https://docs.openstack.org/api-ref/placement/?expanded=#resource-provider-inventories
 
 Usage scenarios
@@ -1060,8 +930,6 @@ here.
 
      $ openstack resource provider inventory set --resource VCPU:allocation_ratio=1.0 815a5634-86fb-4e1e-8824-8a631fee3e06
 
-   Note the :ref:`bug 1804125 <bug-1804125>` restriction.
-
 3. When the deployer wants to **always** use the placement API to set
    allocation ratios, then the deployer should ensure that
    ``[DEFAULT]/xxx_allocation_ratio`` options are all set to None (the

doc/source/user/filter-scheduler.rst

@@ -95,33 +95,12 @@ There are many standard filter classes which may be used
   use a comma. E.g., "value1,value2". All hosts are passed if no extra_specs
   are specified.
 * |ComputeFilter| - passes all hosts that are operational and enabled.
-* |AggregateCoreFilter| - DEPRECATED; filters hosts by CPU core number with per-aggregate
-  :oslo.config:option:`cpu_allocation_ratio` setting. If no
-  per-aggregate value is found, it will fall back to the global default
-  :oslo.config:option:`cpu_allocation_ratio`.
-  If more than one value is found for a host (meaning the host is in two
-  different aggregates with different ratio settings), the minimum value
-  will be used.
 * |IsolatedHostsFilter| - filter based on
   :oslo.config:option:`filter_scheduler.isolated_images`,
   :oslo.config:option:`filter_scheduler.isolated_hosts`
   and :oslo.config:option:`filter_scheduler.restrict_isolated_hosts_to_isolated_images`
   flags.
 * |JsonFilter| - allows simple JSON-based grammar for selecting hosts.
-* |AggregateRamFilter| - DEPRECATED; filters hosts by RAM with per-aggregate
-  :oslo.config:option:`ram_allocation_ratio` setting. If no per-aggregate value
-  is found, it will fall back to the global default
-  :oslo.config:option:`ram_allocation_ratio`.
-  If more than one value is found for a host (meaning the host is in two
-  different aggregates with different ratio settings), the minimum value
-  will be used.
-* |AggregateDiskFilter| - DEPRECATED; filters hosts by disk allocation with per-aggregate
-  :oslo.config:option:`disk_allocation_ratio` setting. If no per-aggregate value
-  is found, it will fall back to the global default
-  :oslo.config:option:`disk_allocation_ratio`.
-  If more than one value is found for a host (meaning the host is in two or more
-  different aggregates with different ratio settings), the minimum value will
-  be used.
 * |NumInstancesFilter| - filters compute nodes by number of instances.
   Nodes with too many instances will be filtered. The host will be
   ignored by the scheduler if more than
@@ -156,8 +135,6 @@ There are many standard filter classes which may be used
   set of instances.
 * |SameHostFilter| - puts the instance on the same host as another instance in
   a set of instances.
-* |RetryFilter| - DEPRECATED; filters hosts that have been attempted for
-  scheduling. Only passes hosts that have not been previously attempted.
 * |AggregateTypeAffinityFilter| - limits instance_type by aggregate.
    This filter passes hosts if no instance_type key is set or
    the instance_type aggregate metadata value contains the name of the
@@ -281,26 +258,6 @@ creation of the new server for the user. The only exception for this rule is
 directly. Variable naming, such as the ``$free_ram_mb`` example above, should
 be based on those attributes.
 
-The |RetryFilter| filters hosts that have already been attempted for
-scheduling. It only passes hosts that have not been previously attempted. If a
-compute node is raising an exception when spawning an instance, then the
-compute manager will reschedule it by adding the failing host to a retry
-dictionary so that the RetryFilter will not accept it as a possible
-destination. That means that if all of your compute nodes are failing, then the
-RetryFilter will return 0 hosts and the scheduler will raise a NoValidHost
-exception even if the problem is related to 1:N compute nodes. If you see that
-case in the scheduler logs, then your problem is most likely related to a
-compute problem and you should check the compute logs.
-
-.. note:: The ``RetryFilter`` is deprecated since the 20.0.0 (Train) release
-          and will be removed in an upcoming release. Since the 17.0.0 (Queens)
-          release, the scheduler has provided alternate hosts for rescheduling
-          so the scheduler does not need to be called during a reschedule which
-          makes the ``RetryFilter`` useless. See the `Return Alternate Hosts`_
-          spec for details.
-
-.. _Return Alternate Hosts: https://specs.openstack.org/openstack/nova-specs/specs/queens/implemented/return-alternate-hosts.html
-
 The |NUMATopologyFilter| considers the NUMA topology that was specified for the instance
 through the use of flavor extra_specs in combination with the image properties, as
 described in detail in the related nova-spec document:
@@ -647,11 +604,8 @@ in :mod:`nova.tests.scheduler`.
 .. |BaseHostFilter| replace:: :class:`BaseHostFilter <nova.scheduler.filters.BaseHostFilter>`
 .. |ComputeCapabilitiesFilter| replace:: :class:`ComputeCapabilitiesFilter <nova.scheduler.filters.compute_capabilities_filter.ComputeCapabilitiesFilter>`
 .. |ComputeFilter| replace:: :class:`ComputeFilter <nova.scheduler.filters.compute_filter.ComputeFilter>`
-.. |AggregateCoreFilter| replace:: :class:`AggregateCoreFilter <nova.scheduler.filters.core_filter.AggregateCoreFilter>`
 .. |IsolatedHostsFilter| replace:: :class:`IsolatedHostsFilter <nova.scheduler.filters.isolated_hosts_filter>`
 .. |JsonFilter| replace:: :class:`JsonFilter <nova.scheduler.filters.json_filter.JsonFilter>`
-.. |AggregateRamFilter| replace:: :class:`AggregateRamFilter <nova.scheduler.filters.ram_filter.AggregateRamFilter>`
-.. |AggregateDiskFilter| replace:: :class:`AggregateDiskFilter <nova.scheduler.filters.disk_filter.AggregateDiskFilter>`
 .. |NumInstancesFilter| replace:: :class:`NumInstancesFilter <nova.scheduler.filters.num_instances_filter.NumInstancesFilter>`
 .. |AggregateNumInstancesFilter| replace:: :class:`AggregateNumInstancesFilter <nova.scheduler.filters.num_instances_filter.AggregateNumInstancesFilter>`
 .. |IoOpsFilter| replace:: :class:`IoOpsFilter <nova.scheduler.filters.io_ops_filter.IoOpsFilter>`
@@ -660,7 +614,6 @@ in :mod:`nova.tests.scheduler`.
 .. |SimpleCIDRAffinityFilter| replace:: :class:`SimpleCIDRAffinityFilter <nova.scheduler.filters.affinity_filter.SimpleCIDRAffinityFilter>`
 .. |DifferentHostFilter| replace:: :class:`DifferentHostFilter <nova.scheduler.filters.affinity_filter.DifferentHostFilter>`
 .. |SameHostFilter| replace:: :class:`SameHostFilter <nova.scheduler.filters.affinity_filter.SameHostFilter>`
-.. |RetryFilter| replace:: :class:`RetryFilter <nova.scheduler.filters.retry_filter.RetryFilter>`
 .. |AggregateTypeAffinityFilter| replace:: :class:`AggregateTypeAffinityFilter <nova.scheduler.filters.type_filter.AggregateTypeAffinityFilter>`
 .. |ServerGroupAntiAffinityFilter| replace:: :class:`ServerGroupAntiAffinityFilter <nova.scheduler.filters.affinity_filter.ServerGroupAntiAffinityFilter>`
 .. |ServerGroupAffinityFilter| replace:: :class:`ServerGroupAffinityFilter <nova.scheduler.filters.affinity_filter.ServerGroupAffinityFilter>`