diff options
| author |  ctiller <ctiller@google.com> | 2014-12-11 09:12:02 -0800 |
|---|---|---|
| committer |  Jan Tattermusch <jtattermusch@google.com> | 2014-12-11 15:11:44 -0800 |
| commit | ccd27fd9b2cc3c2f83dc9a7632f6a2d5f0438c45 (patch) | |
| tree | 590efca1f37caecda9e61355b79c40d5ced761a3 /src/core/channel | |
| parent | 465554e5b6672998aecbd9bee12e831b613e185e (diff) | |
Wait for name resolutions to complete before shutting down iomgr.
This at least avoids crashing when shutting down during name resolution.
There is still a memory leak to track down before I add a test that exposes
this.
This CL also makes some tiny cleanups and debuggability improvements.
Change on 2014/12/11 by ctiller <ctiller@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81882486
Diffstat (limited to 'src/core/channel')
| -rw-r--r-- | src/core/channel/client_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/client_setup.c b/src/core/channel/client_setup.c index 29fe915add..8060b2a36d 100644 --- a/src/core/channel/client_setup.c +++ b/src/core/channel/client_setup.c @@ -211,7 +211,7 @@ void grpc_client_setup_request_finish(grpc_client_setup_request *r, if (retry) { /* TODO(klempner): Replace these values with further consideration. 2x is probably too aggressive of a backoff. */ - gpr_timespec max_backoff = gpr_time_from_micros(120000000); + gpr_timespec max_backoff = gpr_time_from_minutes(2); GPR_ASSERT(!s->in_alarm); s->in_alarm = 1; grpc_alarm_init(&s->backoff_alarm, backoff_alarm_done, s); |