diff options
| author |  Juanli Shen <aspirinsjl@gmail.com> | 2018-02-19 19:19:10 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-19 19:19:10 -0800 |
| commit | 84f94c17aa5ba19daa7cf001360719bdda7be407 (patch) | |
| tree | 1b14186c8d01dac67ed24fd3077d8f3ff9133ed0 /include | |
| parent | 9a5a3883f59d8d3d5d25ffd4337ca150d97e2e38 (diff) | |
| parent | 10142e465105303d6851c82a6b7683e4fb5af71c (diff) | |
Merge pull request #14438 from grpc/revert-14412-revert-14376-revert-14356-revert-13671-grpclb_reresolution
Reintroduce grpclb re-resolution with fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index a372dbba73..3e897b0b27 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -301,7 +301,7 @@ typedef struct { #define GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS "grpc.grpclb_call_timeout_ms" /* Timeout in milliseconds to wait for the serverlist from the grpclb load balancer before using fallback backend addresses from the resolver. - If 0, fallback will never be used. */ + If 0, fallback will never be used. Default value is 10000. */ #define GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS "grpc.grpclb_fallback_timeout_ms" /** If non-zero, grpc server's cronet compression workaround will be enabled */ #define GRPC_ARG_WORKAROUND_CRONET_COMPRESSION \ |