|
|
|
|
@ -416,16 +416,11 @@ class ClientChannel::ResolverResultHandler : public Resolver::ResultHandler { |
|
|
|
|
GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ResolverResultHandler"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ReturnResult(Resolver::Result result) override |
|
|
|
|
void ReportResult(Resolver::Result result) override |
|
|
|
|
ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { |
|
|
|
|
chand_->OnResolverResultChangedLocked(std::move(result)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ReturnError(grpc_error_handle error) override |
|
|
|
|
ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { |
|
|
|
|
chand_->OnResolverErrorLocked(error); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private: |
|
|
|
|
ClientChannel* chand_; |
|
|
|
|
}; |
|
|
|
|
@ -1121,7 +1116,6 @@ ClientChannel::~ClientChannel() { |
|
|
|
|
} |
|
|
|
|
DestroyResolverAndLbPolicyLocked(); |
|
|
|
|
grpc_channel_args_destroy(channel_args_); |
|
|
|
|
GRPC_ERROR_UNREF(resolver_transient_failure_error_); |
|
|
|
|
// Stop backup polling.
|
|
|
|
|
grpc_client_channel_stop_backup_polling(interested_parties_); |
|
|
|
|
grpc_pollset_set_destroy(interested_parties_); |
|
|
|
|
@ -1202,26 +1196,29 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { |
|
|
|
|
//
|
|
|
|
|
// We track a list of strings to eventually be concatenated and traced.
|
|
|
|
|
absl::InlinedVector<const char*, 3> trace_strings; |
|
|
|
|
if (result.addresses.empty() && previous_resolution_contained_addresses_) { |
|
|
|
|
const bool resolution_contains_addresses = |
|
|
|
|
result.addresses.ok() && !result.addresses->empty(); |
|
|
|
|
if (!resolution_contains_addresses && |
|
|
|
|
previous_resolution_contained_addresses_) { |
|
|
|
|
trace_strings.push_back("Address list became empty"); |
|
|
|
|
} else if (!result.addresses.empty() && |
|
|
|
|
} else if (resolution_contains_addresses && |
|
|
|
|
!previous_resolution_contained_addresses_) { |
|
|
|
|
trace_strings.push_back("Address list became non-empty"); |
|
|
|
|
} |
|
|
|
|
previous_resolution_contained_addresses_ = !result.addresses.empty(); |
|
|
|
|
previous_resolution_contained_addresses_ = resolution_contains_addresses; |
|
|
|
|
std::string service_config_error_string_storage; |
|
|
|
|
if (result.service_config_error != GRPC_ERROR_NONE) { |
|
|
|
|
if (!result.service_config.ok()) { |
|
|
|
|
service_config_error_string_storage = |
|
|
|
|
grpc_error_std_string(result.service_config_error); |
|
|
|
|
result.service_config.status().ToString(); |
|
|
|
|
trace_strings.push_back(service_config_error_string_storage.c_str()); |
|
|
|
|
} |
|
|
|
|
// Choose the service config.
|
|
|
|
|
RefCountedPtr<ServiceConfig> service_config; |
|
|
|
|
RefCountedPtr<ConfigSelector> config_selector; |
|
|
|
|
if (result.service_config_error != GRPC_ERROR_NONE) { |
|
|
|
|
if (!result.service_config.ok()) { |
|
|
|
|
if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { |
|
|
|
|
gpr_log(GPR_INFO, "chand=%p: resolver returned service config error: %s", |
|
|
|
|
this, grpc_error_std_string(result.service_config_error).c_str()); |
|
|
|
|
this, result.service_config.status().ToString().c_str()); |
|
|
|
|
} |
|
|
|
|
// If the service config was invalid, then fallback to the
|
|
|
|
|
// previously returned service config.
|
|
|
|
|
@ -1235,13 +1232,13 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { |
|
|
|
|
service_config = saved_service_config_; |
|
|
|
|
config_selector = saved_config_selector_; |
|
|
|
|
} else { |
|
|
|
|
// We received an invalid service config and we don't have a
|
|
|
|
|
// We received a service config error and we don't have a
|
|
|
|
|
// previous service config to fall back to. Put the channel into
|
|
|
|
|
// TRANSIENT_FAILURE.
|
|
|
|
|
OnResolverErrorLocked(GRPC_ERROR_REF(result.service_config_error)); |
|
|
|
|
OnResolverErrorLocked(result.service_config.status()); |
|
|
|
|
trace_strings.push_back("no valid service config"); |
|
|
|
|
} |
|
|
|
|
} else if (result.service_config == nullptr) { |
|
|
|
|
} else if (*result.service_config == nullptr) { |
|
|
|
|
// Resolver did not return any service config.
|
|
|
|
|
if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { |
|
|
|
|
gpr_log(GPR_INFO, |
|
|
|
|
@ -1252,9 +1249,12 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { |
|
|
|
|
service_config = default_service_config_; |
|
|
|
|
} else { |
|
|
|
|
// Use ServiceConfig and ConfigSelector returned by resolver.
|
|
|
|
|
service_config = result.service_config; |
|
|
|
|
service_config = std::move(*result.service_config); |
|
|
|
|
config_selector = ConfigSelector::GetFromChannelArgs(*result.args); |
|
|
|
|
} |
|
|
|
|
// Note: The only case in which service_config is null here is if the resolver
|
|
|
|
|
// returned a service config error and we don't have a previous service
|
|
|
|
|
// config to fall back to.
|
|
|
|
|
if (service_config != nullptr) { |
|
|
|
|
// Extract global config for client channel.
|
|
|
|
|
const internal::ClientChannelGlobalParsedConfig* parsed_service_config = |
|
|
|
|
@ -1306,28 +1306,21 @@ void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ClientChannel::OnResolverErrorLocked(grpc_error_handle error) { |
|
|
|
|
if (resolver_ == nullptr) { |
|
|
|
|
GRPC_ERROR_UNREF(error); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
void ClientChannel::OnResolverErrorLocked(absl::Status status) { |
|
|
|
|
if (resolver_ == nullptr) return; |
|
|
|
|
if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { |
|
|
|
|
gpr_log(GPR_INFO, "chand=%p: resolver transient failure: %s", this, |
|
|
|
|
grpc_error_std_string(error).c_str()); |
|
|
|
|
status.ToString().c_str()); |
|
|
|
|
} |
|
|
|
|
// If we already have an LB policy from a previous resolution
|
|
|
|
|
// result, then we continue to let it set the connectivity state.
|
|
|
|
|
// Otherwise, we go into TRANSIENT_FAILURE.
|
|
|
|
|
if (lb_policy_ == nullptr) { |
|
|
|
|
grpc_error_handle state_error = |
|
|
|
|
GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( |
|
|
|
|
"Resolver transient failure", &error, 1); |
|
|
|
|
absl::Status status = grpc_error_to_absl_status(state_error); |
|
|
|
|
grpc_error_handle error = absl_status_to_grpc_error(status); |
|
|
|
|
{ |
|
|
|
|
MutexLock lock(&resolution_mu_); |
|
|
|
|
// Update resolver transient failure.
|
|
|
|
|
GRPC_ERROR_UNREF(resolver_transient_failure_error_); |
|
|
|
|
resolver_transient_failure_error_ = state_error; |
|
|
|
|
resolver_transient_failure_error_ = status; |
|
|
|
|
// Process calls that were queued waiting for the resolver result.
|
|
|
|
|
for (ResolverQueuedCall* call = resolver_queued_calls_; call != nullptr; |
|
|
|
|
call = call->next) { |
|
|
|
|
@ -1339,12 +1332,12 @@ void ClientChannel::OnResolverErrorLocked(grpc_error_handle error) { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
GRPC_ERROR_UNREF(error); |
|
|
|
|
// Update connectivity state.
|
|
|
|
|
UpdateStateAndPickerLocked( |
|
|
|
|
GRPC_CHANNEL_TRANSIENT_FAILURE, status, "resolver failure", |
|
|
|
|
absl::make_unique<LoadBalancingPolicy::TransientFailurePicker>(status)); |
|
|
|
|
} |
|
|
|
|
GRPC_ERROR_UNREF(error); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ClientChannel::CreateOrUpdateLbPolicyLocked( |
|
|
|
|
@ -1355,6 +1348,7 @@ void ClientChannel::CreateOrUpdateLbPolicyLocked( |
|
|
|
|
LoadBalancingPolicy::UpdateArgs update_args; |
|
|
|
|
update_args.addresses = std::move(result.addresses); |
|
|
|
|
update_args.config = std::move(lb_policy_config); |
|
|
|
|
update_args.resolution_note = std::move(result.resolution_note); |
|
|
|
|
// Add health check service name to channel args.
|
|
|
|
|
absl::InlinedVector<grpc_arg, 1> args_to_add; |
|
|
|
|
if (health_check_service_name.has_value()) { |
|
|
|
|
@ -1495,8 +1489,7 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked() { |
|
|
|
|
// after releasing the lock to keep the critical section small.
|
|
|
|
|
{ |
|
|
|
|
MutexLock lock(&resolution_mu_); |
|
|
|
|
GRPC_ERROR_UNREF(resolver_transient_failure_error_); |
|
|
|
|
resolver_transient_failure_error_ = GRPC_ERROR_NONE; |
|
|
|
|
resolver_transient_failure_error_ = absl::OkStatus(); |
|
|
|
|
// Update service config.
|
|
|
|
|
received_service_config_data_ = true; |
|
|
|
|
// Old values will be unreffed after lock is released.
|
|
|
|
|
@ -2352,12 +2345,11 @@ bool ClientChannel::CallData::CheckResolutionLocked(grpc_call_element* elem, |
|
|
|
|
if (GPR_UNLIKELY(!chand->received_service_config_data_)) { |
|
|
|
|
// If the resolver returned transient failure before returning the
|
|
|
|
|
// first service config, fail any non-wait_for_ready calls.
|
|
|
|
|
grpc_error_handle resolver_error = chand->resolver_transient_failure_error_; |
|
|
|
|
if (resolver_error != GRPC_ERROR_NONE && |
|
|
|
|
(send_initial_metadata_flags & GRPC_INITIAL_METADATA_WAIT_FOR_READY) == |
|
|
|
|
0) { |
|
|
|
|
absl::Status resolver_error = chand->resolver_transient_failure_error_; |
|
|
|
|
if (!resolver_error.ok() && (send_initial_metadata_flags & |
|
|
|
|
GRPC_INITIAL_METADATA_WAIT_FOR_READY) == 0) { |
|
|
|
|
MaybeRemoveCallFromResolverQueuedCallsLocked(elem); |
|
|
|
|
*error = GRPC_ERROR_REF(resolver_error); |
|
|
|
|
*error = absl_status_to_grpc_error(resolver_error); |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
// Either the resolver has not yet returned a result, or it has
|
|
|
|
|
|
Mark D. Roth
3 years ago
committed by
GitHub