From 078edf5cd1e5f040de6fcefa3dfce8ab57e01a2a Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Wed, 13 Jun 2018 17:44:27 +0000
Subject: [PATCH] router: Add support for gRPC request timeout (#3564)

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>

Mirrored from https://github.com/envoyproxy/envoy @ 7f800115ba2b8d7a053872f1f852d4ba5996ae4d
---
 envoy/api/v2/route/route.proto | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto
index 97533895..9d972f9d 100644
--- a/envoy/api/v2/route/route.proto
+++ b/envoy/api/v2/route/route.proto
@@ -305,7 +305,7 @@ message CorsPolicy {
   google.protobuf.BoolValue enabled = 7;
 }
 
-// [#comment:next free field: 23]
+// [#comment:next free field: 24]
 message RouteAction {
   oneof cluster_specifier {
     option (validate.required) = true;
@@ -609,6 +609,18 @@ message RouteAction {
   CorsPolicy cors = 17;
 
   reserved 21;
+
+  // If present, and the request is a gRPC request, use the
+  // `grpc-timeout header <https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md>`_,
+  // or its default value (infinity) instead of
+  // :ref:`timeout <envoy_api_field_route.RouteAction.timeout>`, but limit the applied timeout
+  // to the maximum value specified here. If configured as 0, the maximum allowed timeout for
+  // gRPC requests is infinity. If not configured at all, the `grpc-timeout` header is not used
+  // and gRPC requests time out like any other requests using
+  // :ref:`timeout <envoy_api_field_route.RouteAction.timeout>` or its default.
+  // This can be used to prevent unexpected upstream request timeouts due to potentially long
+  // time gaps between gRPC request and response in gRPC streaming mode.
+  google.protobuf.Duration max_grpc_timeout = 23 [(gogoproto.stdduration) = true];
 }
 
 message RedirectAction {