aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar apolcyn <apolcyn@google.com>2018-11-30 16:58:16 -0800
committerGravatar GitHub <noreply@github.com>2018-11-30 16:58:16 -0800
commit5fed8e54528ca94213fec7038f56d9db91709c33 (patch)
tree07308d68e04e6e67f79b5c7adb360f677c8fdbdc /include
parent09add58ecaec113c652cb2ad6283b51c0bfb4948 (diff)
parentb203ed3c071361826f3b24d940e6bfa1c3d19f81 (diff)
Merge pull request #17354 from apolcyn/fix_ares_deadlocks
Cancel c-ares queries after a timeout to avoid getting stuck
Diffstat (limited to 'include')
-rw-r--r--include/grpc/impl/codegen/grpc_types.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index d1cc6af04f..a9fb27946e 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -350,6 +350,11 @@ typedef struct {
/** If set, inhibits health checking (which may be enabled via the
* service config.) */
#define GRPC_ARG_INHIBIT_HEALTH_CHECKING "grpc.inhibit_health_checking"
+/** If set, determines the number of milliseconds that the c-ares based
+ * DNS resolver will wait on queries before cancelling them. The default value
+ * is 10000. Setting this to "0" will disable c-ares query timeouts
+ * entirely. */
+#define GRPC_ARG_DNS_ARES_QUERY_TIMEOUT_MS "grpc.dns_ares_query_timeout"
/** \} */
/** Result of a grpc call. If the caller satisfies the prerequisites of a