diff options
| author | itrofimow <itrofimow@yandex-team.com> | 2024-02-01 13:12:31 +0300 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-02-09 19:16:52 +0300 |
| commit | e956ec10e5fa67631730f3822779e5bb20434691 (patch) | |
| tree | e9515da932aa841873426ac4db525018742495ca | |
| parent | 48899fc467679556c588087b21e4d7b75d87254f (diff) | |
| download | ydb-e956ec10e5fa67631730f3822779e5bb20434691.tar.gz | |
cc contrib/grpc: unify one of the patches with how upstream fixed the issue
| -rw-r--r-- | contrib/libs/grpc/src/core/ext/filters/client_channel/retry_filter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libs/grpc/src/core/ext/filters/client_channel/retry_filter.cc b/contrib/libs/grpc/src/core/ext/filters/client_channel/retry_filter.cc index c98ce6ee0b..bc965c4731 100644 --- a/contrib/libs/grpc/src/core/ext/filters/client_channel/retry_filter.cc +++ b/contrib/libs/grpc/src/core/ext/filters/client_channel/retry_filter.cc @@ -2603,8 +2603,8 @@ void RetryFilter::CallData::OnRetryTimer() { void RetryFilter::CallData::OnRetryTimerLocked(void* arg, grpc_error_handle /*error*/) { auto* calld = static_cast<CallData*>(arg); - calld->retry_timer_handle_.reset(); - if (calld->cancelled_from_surface_.ok()) { + if (calld->retry_timer_handle_.has_value()) { + calld->retry_timer_handle_.reset(); calld->CreateCallAttempt(/*is_transparent_retry=*/false); } GRPC_CALL_STACK_UNREF(calld->owning_call_, "OnRetryTimer"); |