From 5e8545db4de5e633c1514a8d5fc6304c528c2ae6 Mon Sep 17 00:00:00 2001 From: kerrick-lyft Date: Tue, 27 Sep 2016 14:32:48 -0700 Subject: [PATCH 1/2] x-envoy-upstream-rq-per-try-timeout-ms timeouts *are* retried --- docs/configuration/http_filters/router_filter.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/configuration/http_filters/router_filter.rst b/docs/configuration/http_filters/router_filter.rst index b23f0d616d1c..83bc9a3f338a 100644 --- a/docs/configuration/http_filters/router_filter.rst +++ b/docs/configuration/http_filters/router_filter.rst @@ -70,9 +70,7 @@ using a ',' delimited list. The supported policies are: Envoy will attempt a retry if the upstream server responds with any 5xx response code, or does not respond at all (disconnect/reset/etc.). (Includes *connect-failure* and *refused-stream*) - * **NOTE:** Envoy will not retry when a request times out (resulting in a 504 error code). This is - by design. The request timeout is an outer time limit for a request, including any retries that - take place. + * **NOTE:** Envoy will not retry when a request exceeds :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` (resulting in a 504 error code). Use :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` if you want to retry when individual attempts take too long. :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` is an outer time limit for a request, including any retries that take place. connect-failure Envoy will attempt a retry if a request is failed because of a connection failure to the upstream From c8c5885bd7b9468c0426b0ef8c8b5523b5829075 Mon Sep 17 00:00:00 2001 From: Kerrick Staley Date: Tue, 27 Sep 2016 14:51:32 -0700 Subject: [PATCH 2/2] Wrap at 100 chars --- docs/configuration/http_filters/router_filter.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/configuration/http_filters/router_filter.rst b/docs/configuration/http_filters/router_filter.rst index 83bc9a3f338a..64f6350edc73 100644 --- a/docs/configuration/http_filters/router_filter.rst +++ b/docs/configuration/http_filters/router_filter.rst @@ -70,7 +70,12 @@ using a ',' delimited list. The supported policies are: Envoy will attempt a retry if the upstream server responds with any 5xx response code, or does not respond at all (disconnect/reset/etc.). (Includes *connect-failure* and *refused-stream*) - * **NOTE:** Envoy will not retry when a request exceeds :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` (resulting in a 504 error code). Use :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` if you want to retry when individual attempts take too long. :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` is an outer time limit for a request, including any retries that take place. + * **NOTE:** Envoy will not retry when a request exceeds + :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` (resulting in a 504 error + code). Use :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` if you want + to retry when individual attempts take too long. + :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms` is an outer time limit for a + request, including any retries that take place. connect-failure Envoy will attempt a retry if a request is failed because of a connection failure to the upstream