Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/root/intro/arch_overview/grpc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ Envoy supports two gRPC bridges:
gRPC services
-------------

In addition to proxying gRPC on the data plane, Envoy make use of gRPC for its
In addition to proxying gRPC on the data plane, Envoy makes use of gRPC for its
control plane, where it :ref:`fetches configuration from management server(s)
<config_overview_v2>` and also in filters, for example for :ref:`rate limiting
<config_overview_v2>` and in filters, such as for :ref:`rate limiting
<config_http_filters_rate_limit>` or authorization checks. We refer to these as
*gRPC services*.

Expand Down
18 changes: 9 additions & 9 deletions docs/root/intro/arch_overview/http_connection_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@ table <arch_overview_http_routing>`. The route table can be specified in one of
Retry plugin configuration
--------------------------

Normally during retries, hosts selection follows the same process as the original request. To modify
this behavior retry plugins can be used, which fall into two categories:
Normally during retries, host selection follows the same process as the original request. Retry plugins
can be used to modify this behavior, and they fall into two categories:

* :ref:`Host Predicates <envoy_api_field_route.RetryPolicy.retry_host_predicate>`:
These predicates can be used to "reject" a host, which will cause host selection to be reattempted.
Any number of these predicates can be specified, and the host will be rejected if any of the predicates reject the host.
These predicates can be used to "reject" a host, which will cause host selection to be reattempted.
Any number of these predicates can be specified, and the host will be rejected if any of the predicates reject the host.

Envoy supports the following built-in host predicates

* *envoy.retry_host_predicates.previous_hosts*: This will keep track of previously attempted hosts, and rejects
hosts that have already been attempted.

* :ref:`Priority Predicates<envoy_api_field_route.RetryPolicy.retry_priority>`: These predicates can
be used to adjust the priority load used when selecting a priority for a retry attempt. Only one such
predicate may be specified.

Envoy supports the following built-in priority predicates

* *envoy.retry_priority.previous_priorities*: This will keep track of previously attempted priorities,
* *envoy.retry_priority.previous_priorities*: This will keep track of previously attempted priorities,
and adjust the priority load such that other priorities will be targeted in subsequent retry attempts.

Host selection will continue until either the configured predicates accept the host or a configurable
:ref:`max attempts <envoy_api_field_route.RetryPolicy.host_selection_retry_max_attempts>` has been reached.
:ref:`max attempts <envoy_api_field_route.RetryPolicy.host_selection_retry_max_attempts>` has been reached.

These plugins can be combined to affect both host selection and priority load. Envoy can also be extended
These plugins can be combined to affect both host selection and priority load. Envoy can also be extended
with custom retry plugins similar to how custom filters can be added.


Expand Down Expand Up @@ -152,7 +152,7 @@ upstream will be modified by:
2. Replacing the Authority/Host, Scheme, and Path headers with the values from the Location header.

The altered request headers will then have a new route selected, be sent through a new filter chain,
and then shipped upstream with all of the normal Envoy request sanitization taking place.
and then shipped upstream with all of the normal Envoy request sanitization taking place.

.. warning::
Note that HTTP connection manager sanitization such as clearing untrusted headers will only be
Expand Down