aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2018-01-31 20:33:03 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2018-01-31 20:33:03 -0800
commitf25126cffb3338249445ab96dded66ff70f0e289 (patch)
tree1b66f09083dfcd3362b2a58dd8845e8bcfe1cbed /src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
parentaf7afbd4a12de16dda4f34db2a4d5ae8d3059091 (diff)
PR comments
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc')
-rw-r--r--src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
index d2bf9950ee..82cdb81c8b 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -357,6 +357,8 @@ static void dns_ares_maybe_start_resolving_locked(ares_dns_resolver* r) {
grpc_timer_init(&r->next_resolution_timer, ms_until_next_resolution,
&r->deferred_resolution_closure);
}
+ // TODO(dgq): remove the following two lines once Pick First stops
+ // discarding subchannels after selecting.
++r->resolved_version;
dns_ares_maybe_finish_next_locked(r);
return;
@@ -426,9 +428,8 @@ static grpc_resolver* dns_ares_create(grpc_resolver_args* args,
grpc_combiner_scheduler(r->base.combiner));
const grpc_arg* period_arg = grpc_channel_args_find(
args->args, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS);
- const grpc_millis min_time_between_resolutions =
+ r->min_time_between_resolutions =
grpc_channel_arg_get_integer(period_arg, {1000, 0, INT_MAX});
- r->min_time_between_resolutions = min_time_between_resolutions;
r->last_resolution_timestamp = -1;
GRPC_CLOSURE_INIT(&r->deferred_resolution_closure, ares_cooldown_cb, r,
grpc_combiner_scheduler(r->base.combiner));