|
|
|
|
@ -59,9 +59,6 @@ |
|
|
|
|
#include "src/core/lib/event_engine/channel_args_endpoint_config.h" |
|
|
|
|
#include "src/core/lib/event_engine/extensions/supports_fd.h" |
|
|
|
|
#include "src/core/lib/event_engine/query_extensions.h" |
|
|
|
|
#include "src/core/lib/event_engine/resolved_address_internal.h" |
|
|
|
|
#include "src/core/lib/event_engine/tcp_socket_utils.h" |
|
|
|
|
#include "src/core/lib/event_engine/utils.h" |
|
|
|
|
#include "src/core/lib/iomgr/closure.h" |
|
|
|
|
#include "src/core/lib/iomgr/endpoint.h" |
|
|
|
|
#include "src/core/lib/iomgr/event_engine_shims/endpoint.h" |
|
|
|
|
@ -116,8 +113,7 @@ using AcceptorPtr = std::unique_ptr<grpc_tcp_server_acceptor, AcceptorDeleter>; |
|
|
|
|
|
|
|
|
|
class Chttp2ServerListener : public Server::ListenerInterface { |
|
|
|
|
public: |
|
|
|
|
static grpc_error_handle Create(Server* server, |
|
|
|
|
const EventEngine::ResolvedAddress& addr, |
|
|
|
|
static grpc_error_handle Create(Server* server, grpc_resolved_address* addr, |
|
|
|
|
const ChannelArgs& args, |
|
|
|
|
Chttp2ServerArgsModifier args_modifier, |
|
|
|
|
int* port_num); |
|
|
|
|
@ -705,9 +701,8 @@ void Chttp2ServerListener::ActiveConnection::OnDrainGraceTimeExpiry() { |
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
grpc_error_handle Chttp2ServerListener::Create( |
|
|
|
|
Server* server, const EventEngine::ResolvedAddress& addr, |
|
|
|
|
const ChannelArgs& args, Chttp2ServerArgsModifier args_modifier, |
|
|
|
|
int* port_num) { |
|
|
|
|
Server* server, grpc_resolved_address* addr, const ChannelArgs& args, |
|
|
|
|
Chttp2ServerArgsModifier args_modifier, int* port_num) { |
|
|
|
|
// Create Chttp2ServerListener.
|
|
|
|
|
OrphanablePtr<Chttp2ServerListener> listener = |
|
|
|
|
MakeOrphanable<Chttp2ServerListener>(server, args, args_modifier, |
|
|
|
|
@ -719,24 +714,18 @@ grpc_error_handle Chttp2ServerListener::Create( |
|
|
|
|
&listener->tcp_server_shutdown_complete_, ChannelArgsEndpointConfig(args), |
|
|
|
|
OnAccept, listener.get(), &listener->tcp_server_); |
|
|
|
|
if (!error.ok()) return error; |
|
|
|
|
// TODO(yijiem): remove this conversion when we remove all
|
|
|
|
|
// grpc_resolved_address usages.
|
|
|
|
|
grpc_resolved_address iomgr_addr = |
|
|
|
|
grpc_event_engine::experimental::CreateGRPCResolvedAddress(addr); |
|
|
|
|
if (listener->config_fetcher_ != nullptr) { |
|
|
|
|
listener->resolved_address_ = iomgr_addr; |
|
|
|
|
listener->resolved_address_ = *addr; |
|
|
|
|
// TODO(yashykt): Consider binding so as to be able to return the port
|
|
|
|
|
// number.
|
|
|
|
|
} else { |
|
|
|
|
error = |
|
|
|
|
grpc_tcp_server_add_port(listener->tcp_server_, &iomgr_addr, port_num); |
|
|
|
|
error = grpc_tcp_server_add_port(listener->tcp_server_, addr, port_num); |
|
|
|
|
if (!error.ok()) return error; |
|
|
|
|
} |
|
|
|
|
// Create channelz node.
|
|
|
|
|
if (args.GetBool(GRPC_ARG_ENABLE_CHANNELZ) |
|
|
|
|
.value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) { |
|
|
|
|
auto string_address = |
|
|
|
|
grpc_event_engine::experimental::ResolvedAddressToString(addr); |
|
|
|
|
auto string_address = grpc_sockaddr_to_uri(addr); |
|
|
|
|
if (!string_address.ok()) { |
|
|
|
|
return GRPC_ERROR_CREATE(string_address.status().ToString()); |
|
|
|
|
} |
|
|
|
|
@ -966,53 +955,37 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, |
|
|
|
|
args_modifier); |
|
|
|
|
} |
|
|
|
|
*port_num = -1; |
|
|
|
|
absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> results = |
|
|
|
|
std::vector<EventEngine::ResolvedAddress>(); |
|
|
|
|
absl::StatusOr<std::vector<grpc_resolved_address>> resolved_or; |
|
|
|
|
std::vector<grpc_error_handle> error_list; |
|
|
|
|
std::string parsed_addr = URI::PercentDecode(addr); |
|
|
|
|
absl::string_view parsed_addr_unprefixed{parsed_addr}; |
|
|
|
|
// Using lambda to avoid use of goto.
|
|
|
|
|
grpc_error_handle error = [&]() { |
|
|
|
|
grpc_error_handle error; |
|
|
|
|
if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix) || |
|
|
|
|
absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixAbstractUriPrefix) || |
|
|
|
|
absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) { |
|
|
|
|
absl::StatusOr<EventEngine::ResolvedAddress> result = |
|
|
|
|
grpc_event_engine::experimental::URIToResolvedAddress(parsed_addr); |
|
|
|
|
GRPC_RETURN_IF_ERROR(result.status()); |
|
|
|
|
results->push_back(*result); |
|
|
|
|
if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix)) { |
|
|
|
|
resolved_or = grpc_resolve_unix_domain_address(parsed_addr_unprefixed); |
|
|
|
|
} else if (absl::ConsumePrefix(&parsed_addr_unprefixed, |
|
|
|
|
kUnixAbstractUriPrefix)) { |
|
|
|
|
resolved_or = |
|
|
|
|
grpc_resolve_unix_abstract_domain_address(parsed_addr_unprefixed); |
|
|
|
|
} else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) { |
|
|
|
|
resolved_or = grpc_resolve_vsock_address(parsed_addr_unprefixed); |
|
|
|
|
} else { |
|
|
|
|
if (IsEventEngineDnsNonClientChannelEnabled()) { |
|
|
|
|
absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>> ee_resolver = |
|
|
|
|
args.GetObjectRef<EventEngine>()->GetDNSResolver( |
|
|
|
|
EventEngine::DNSResolver::ResolverOptions()); |
|
|
|
|
GRPC_RETURN_IF_ERROR(ee_resolver.status()); |
|
|
|
|
results = grpc_event_engine::experimental::LookupHostnameBlocking( |
|
|
|
|
ee_resolver->get(), parsed_addr, "https"); |
|
|
|
|
} else { |
|
|
|
|
// TODO(yijiem): Remove this after event_engine_dns_non_client_channel
|
|
|
|
|
// is fully enabled.
|
|
|
|
|
absl::StatusOr<std::vector<grpc_resolved_address>> iomgr_results = |
|
|
|
|
GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https"); |
|
|
|
|
GRPC_RETURN_IF_ERROR(iomgr_results.status()); |
|
|
|
|
for (const auto& addr : *iomgr_results) { |
|
|
|
|
results->push_back( |
|
|
|
|
grpc_event_engine::experimental::CreateResolvedAddress(addr)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
resolved_or = |
|
|
|
|
GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https"); |
|
|
|
|
} |
|
|
|
|
if (!resolved_or.ok()) { |
|
|
|
|
return absl_status_to_grpc_error(resolved_or.status()); |
|
|
|
|
} |
|
|
|
|
GRPC_RETURN_IF_ERROR(results.status()); |
|
|
|
|
// Create a listener for each resolved address.
|
|
|
|
|
for (EventEngine::ResolvedAddress& addr : *results) { |
|
|
|
|
for (auto& addr : *resolved_or) { |
|
|
|
|
// If address has a wildcard port (0), use the same port as a previous
|
|
|
|
|
// listener.
|
|
|
|
|
if (*port_num != -1 && |
|
|
|
|
grpc_event_engine::experimental::ResolvedAddressGetPort(addr) == 0) { |
|
|
|
|
grpc_event_engine::experimental::ResolvedAddressSetPort(addr, |
|
|
|
|
*port_num); |
|
|
|
|
if (*port_num != -1 && grpc_sockaddr_get_port(&addr) == 0) { |
|
|
|
|
grpc_sockaddr_set_port(&addr, *port_num); |
|
|
|
|
} |
|
|
|
|
int port_temp = -1; |
|
|
|
|
error = Chttp2ServerListener::Create(server, addr, args, args_modifier, |
|
|
|
|
error = Chttp2ServerListener::Create(server, &addr, args, args_modifier, |
|
|
|
|
&port_temp); |
|
|
|
|
if (!error.ok()) { |
|
|
|
|
error_list.push_back(error); |
|
|
|
|
@ -1024,17 +997,17 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (error_list.size() == results->size()) { |
|
|
|
|
if (error_list.size() == resolved_or->size()) { |
|
|
|
|
std::string msg = absl::StrFormat( |
|
|
|
|
"No address added out of total %" PRIuPTR " resolved for '%s'", |
|
|
|
|
results->size(), addr); |
|
|
|
|
resolved_or->size(), addr); |
|
|
|
|
return GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(), |
|
|
|
|
error_list.size()); |
|
|
|
|
} else if (!error_list.empty()) { |
|
|
|
|
std::string msg = |
|
|
|
|
absl::StrFormat("Only %" PRIuPTR |
|
|
|
|
" addresses added out of total %" PRIuPTR " resolved", |
|
|
|
|
results->size() - error_list.size(), results->size()); |
|
|
|
|
std::string msg = absl::StrFormat( |
|
|
|
|
"Only %" PRIuPTR " addresses added out of total %" PRIuPTR |
|
|
|
|
" resolved", |
|
|
|
|
resolved_or->size() - error_list.size(), resolved_or->size()); |
|
|
|
|
error = GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(), |
|
|
|
|
error_list.size()); |
|
|
|
|
LOG(INFO) << "WARNING: " << StatusToString(error); |
|
|
|
|
|
Yijie Ma
4 months ago
committed by
Copybara-Service