diff options
| author | gusev-p <gusev-p@yandex-team.ru> | 2022-02-10 16:47:20 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:20 +0300 |
| commit | 1715700d00b30399d3648be821fd585ae552365e (patch) | |
| tree | 6857a59158ea36e56d87fb32fbb8e44673c0ca0f /contrib/libs/grpc | |
| parent | b23c1d7a8015c2006a148fd93b84cdeb0aee17a3 (diff) | |
| download | ydb-1715700d00b30399d3648be821fd585ae552365e.tar.gz | |
Restoring authorship annotation for <gusev-p@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/grpc')
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 43d638ab3f..f31457b452 100644 --- a/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -491,7 +491,7 @@ static bool should_use_ares(const char* resolver_env) { static bool should_use_ares(const char* resolver_env) { // TODO(lidiz): Remove the "g_custom_iomgr_enabled" flag once c-ares support // custom IO managers (e.g. gevent). - return !g_custom_iomgr_enabled && resolver_env != nullptr && (gpr_stricmp(resolver_env, "ares") == 0); + return !g_custom_iomgr_enabled && resolver_env != nullptr && (gpr_stricmp(resolver_env, "ares") == 0); } #endif /* GRPC_UV */ diff --git a/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index a0e3566190..269f60556a 100644 --- a/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/contrib/libs/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -178,7 +178,7 @@ void NativeDnsResolver::OnResolvedLocked(grpc_error* error) { if (shutdown_) { if (addresses_ != nullptr) { grpc_resolved_addresses_destroy(addresses_); - } + } Unref(DEBUG_LOCATION, "dns-resolving"); GRPC_ERROR_UNREF(error); return; diff --git a/contrib/libs/grpc/src/core/lib/surface/init.cc b/contrib/libs/grpc/src/core/lib/surface/init.cc index 7b79ba426b..20fedce532 100644 --- a/contrib/libs/grpc/src/core/lib/surface/init.cc +++ b/contrib/libs/grpc/src/core/lib/surface/init.cc @@ -191,7 +191,7 @@ void grpc_shutdown_internal_locked(void) { grpc_core::channelz::ChannelzRegistry::Shutdown(); grpc_stats_shutdown(); } - grpc_core::Fork::GlobalShutdown(); + grpc_core::Fork::GlobalShutdown(); grpc_core::ExecCtx::GlobalShutdown(); grpc_core::ApplicationCallbackExecCtx::GlobalShutdown(); g_shutting_down = false; diff --git a/contrib/libs/grpc/src/cpp/server/server_builder.cc b/contrib/libs/grpc/src/cpp/server/server_builder.cc index 0cc00b365f..8b846ba178 100644 --- a/contrib/libs/grpc/src/cpp/server/server_builder.cc +++ b/contrib/libs/grpc/src/cpp/server/server_builder.cc @@ -397,7 +397,7 @@ std::unique_ptr<grpc::Server> ServerBuilder::BuildAndStart() { for (auto& port : ports_) { int r = server->AddListeningPort(port.addr, port.creds.get()); if (!r) { - server->Shutdown(); + server->Shutdown(); return nullptr; } if (port.selected_port != nullptr) { |