diff options
| author |  Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-02-26 12:13:20 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-26 12:13:20 -0800 |
| commit | 200dffc822bb8383ef325b75861eff21f911e98e (patch) | |
| tree | 479b3a55facfd149e0875941b4210322a0109f51 /src/core/ext/filters/max_age/max_age_filter.cc | |
| parent | a5093a3cdc6cce1ba4d238794aa335509adac683 (diff) | |
| parent | 7f734dd761bf24afdd49694c3022e950f517003c (diff) | |
Merge pull request #14525 from grpc/v1.10.x
Upmerge 1.10.x into master
Diffstat (limited to 'src/core/ext/filters/max_age/max_age_filter.cc')
| -rw-r--r-- | src/core/ext/filters/max_age/max_age_filter.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index acb1d66fa8..1fe8288bd0 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -370,6 +370,9 @@ static void channel_connectivity_changed(void* arg, grpc_error* error) { max_idle_timer, and prevent max_idle_timer from being started in the future. */ increase_call_count(chand); + if (gpr_atm_acq_load(&chand->idle_state) == MAX_IDLE_STATE_SEEN_EXIT_IDLE) { + grpc_timer_cancel(&chand->max_idle_timer); + } } } |