#include <stdio.h>
#include <string.h>
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
#include "src/core/ext/filters/client_channel/backup_poller.h"
#include "src/core/ext/filters/client_channel/http_connect_handshaker.h"
+#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h"
#include "src/core/ext/filters/client_channel/lb_policy_registry.h"
#include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
#include "src/core/ext/filters/client_channel/resolver_registry.h"
#include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gprpp/inlined_vector.h"
#include "src/core/lib/gprpp/manual_constructor.h"
#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/iomgr/combiner.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/profiling/timers.h"
RefCountedPtr<ResolvingLoadBalancingPolicy> parent)
: parent_(std::move(parent)) {}
- ~ResolverResultHandler() {
+ ~ResolverResultHandler() override {
if (GRPC_TRACE_FLAG_ENABLED(*(parent_->tracer_))) {
gpr_log(GPR_INFO, "resolving_lb=%p: resolver shutdown complete",
parent_.get());
RefCountedPtr<ResolvingLoadBalancingPolicy> parent)
: parent_(std::move(parent)) {}
- Subchannel* CreateSubchannel(const grpc_channel_args& args) override {
+ RefCountedPtr<SubchannelInterface> CreateSubchannel(
+ ServerAddress address, const grpc_channel_args& args) override {
if (parent_->resolver_ == nullptr) return nullptr; // Shutting down.
- if (!CalledByCurrentChild() && !CalledByPendingChild()) return nullptr;
- return parent_->channel_control_helper()->CreateSubchannel(args);
+ return parent_->channel_control_helper()->CreateSubchannel(
+ std::move(address), args);
}
- grpc_channel* CreateChannel(const char* target,
- const grpc_channel_args& args) override {
- if (parent_->resolver_ == nullptr) return nullptr; // Shutting down.
- if (!CalledByCurrentChild() && !CalledByPendingChild()) return nullptr;
- return parent_->channel_control_helper()->CreateChannel(target, args);
- }
-
- void UpdateState(grpc_connectivity_state state,
- UniquePtr<SubchannelPicker> picker) override {
+ void UpdateState(grpc_connectivity_state state, const absl::Status& status,
+ std::unique_ptr<SubchannelPicker> picker) override {
if (parent_->resolver_ == nullptr) return; // Shutting down.
- // If this request is from the pending child policy, ignore it until
- // it reports READY, at which point we swap it into place.
- if (CalledByPendingChild()) {
- if (GRPC_TRACE_FLAG_ENABLED(*(parent_->tracer_))) {
- gpr_log(GPR_INFO,
- "resolving_lb=%p helper=%p: pending child policy %p reports "
- "state=%s",
- parent_.get(), this, child_,
- grpc_connectivity_state_name(state));
- }
- if (state != GRPC_CHANNEL_READY) return;
- grpc_pollset_set_del_pollset_set(
- parent_->lb_policy_->interested_parties(),
- parent_->interested_parties());
- MutexLock lock(&parent_->lb_policy_mu_);
- parent_->lb_policy_ = std::move(parent_->pending_lb_policy_);
- } else if (!CalledByCurrentChild()) {
- // This request is from an outdated child, so ignore it.
- return;
- }
- parent_->channel_control_helper()->UpdateState(state, std::move(picker));
+ parent_->channel_control_helper()->UpdateState(state, status,
+ std::move(picker));
}
void RequestReresolution() override {
- // If there is a pending child policy, ignore re-resolution requests
- // from the current child policy (or any outdated child).
- if (parent_->pending_lb_policy_ != nullptr && !CalledByPendingChild()) {
- return;
- }
+ if (parent_->resolver_ == nullptr) return; // Shutting down.
if (GRPC_TRACE_FLAG_ENABLED(*(parent_->tracer_))) {
gpr_log(GPR_INFO, "resolving_lb=%p: started name re-resolving",
parent_.get());
}
- if (parent_->resolver_ != nullptr) {
- parent_->resolver_->RequestReresolutionLocked();
- }
+ parent_->resolver_->RequestReresolutionLocked();
}
- void set_child(LoadBalancingPolicy* child) { child_ = child; }
-
- private:
- bool CalledByPendingChild() const {
- GPR_ASSERT(child_ != nullptr);
- return child_ == parent_->pending_lb_policy_.get();
+ void AddTraceEvent(TraceSeverity severity,
+ absl::string_view message) override {
+ if (parent_->resolver_ == nullptr) return; // Shutting down.
+ parent_->channel_control_helper()->AddTraceEvent(severity, message);
}
- bool CalledByCurrentChild() const {
- GPR_ASSERT(child_ != nullptr);
- return child_ == parent_->lb_policy_.get();
- };
-
+ private:
RefCountedPtr<ResolvingLoadBalancingPolicy> parent_;
- LoadBalancingPolicy* child_ = nullptr;
};
//
//
ResolvingLoadBalancingPolicy::ResolvingLoadBalancingPolicy(
- Args args, TraceFlag* tracer, UniquePtr<char> target_uri,
- UniquePtr<char> child_policy_name,
- RefCountedPtr<ParsedLoadBalancingConfig> child_lb_config,
- grpc_error** error)
- : LoadBalancingPolicy(std::move(args)),
- tracer_(tracer),
- target_uri_(std::move(target_uri)),
- child_policy_name_(std::move(child_policy_name)),
- child_lb_config_(std::move(child_lb_config)) {
- GPR_ASSERT(child_policy_name_ != nullptr);
- // Don't fetch service config, since this ctor is for use in nested LB
- // policies, not at the top level, and we only fetch the service
- // config at the top level.
- grpc_arg arg = grpc_channel_arg_integer_create(
- const_cast<char*>(GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION), 0);
- grpc_channel_args* new_args =
- grpc_channel_args_copy_and_add(args.args, &arg, 1);
- *error = Init(*new_args);
- grpc_channel_args_destroy(new_args);
-}
-
-ResolvingLoadBalancingPolicy::ResolvingLoadBalancingPolicy(
- Args args, TraceFlag* tracer, UniquePtr<char> target_uri,
- ProcessResolverResultCallback process_resolver_result,
- void* process_resolver_result_user_data, grpc_error** error)
+ Args args, TraceFlag* tracer, grpc_core::UniquePtr<char> target_uri,
+ ChannelConfigHelper* helper)
: LoadBalancingPolicy(std::move(args)),
tracer_(tracer),
target_uri_(std::move(target_uri)),
- process_resolver_result_(process_resolver_result),
- process_resolver_result_user_data_(process_resolver_result_user_data) {
- GPR_ASSERT(process_resolver_result != nullptr);
- gpr_mu_init(&lb_policy_mu_);
- *error = Init(*args.args);
-}
-
-grpc_error* ResolvingLoadBalancingPolicy::Init(const grpc_channel_args& args) {
+ helper_(helper) {
+ GPR_ASSERT(helper_ != nullptr);
resolver_ = ResolverRegistry::CreateResolver(
- target_uri_.get(), &args, interested_parties(), combiner(),
- UniquePtr<Resolver::ResultHandler>(New<ResolverResultHandler>(Ref())));
- if (resolver_ == nullptr) {
- return GRPC_ERROR_CREATE_FROM_STATIC_STRING("resolver creation failed");
+ target_uri_.get(), args.args, interested_parties(), work_serializer(),
+ absl::make_unique<ResolverResultHandler>(Ref()));
+ // Since the validity of args has been checked when create the channel,
+ // CreateResolver() must return a non-null result.
+ GPR_ASSERT(resolver_ != nullptr);
+ if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
+ gpr_log(GPR_INFO, "resolving_lb=%p: starting name resolution", this);
}
- // Return our picker to the channel.
- channel_control_helper()->UpdateState(
- GRPC_CHANNEL_IDLE, UniquePtr<SubchannelPicker>(New<QueuePicker>(Ref())));
- return GRPC_ERROR_NONE;
+ channel_control_helper()->UpdateState(GRPC_CHANNEL_CONNECTING, absl::Status(),
+ absl::make_unique<QueuePicker>(Ref()));
+ resolver_->StartLocked();
}
ResolvingLoadBalancingPolicy::~ResolvingLoadBalancingPolicy() {
GPR_ASSERT(resolver_ == nullptr);
GPR_ASSERT(lb_policy_ == nullptr);
- gpr_mu_destroy(&lb_policy_mu_);
}
void ResolvingLoadBalancingPolicy::ShutdownLocked() {
if (resolver_ != nullptr) {
+ if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
+ gpr_log(GPR_INFO, "resolving_lb=%p: shutting down resolver=%p", this,
+ resolver_.get());
+ }
resolver_.reset();
- MutexLock lock(&lb_policy_mu_);
if (lb_policy_ != nullptr) {
if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
gpr_log(GPR_INFO, "resolving_lb=%p: shutting down lb_policy=%p", this,
interested_parties());
lb_policy_.reset();
}
- if (pending_lb_policy_ != nullptr) {
- if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
- gpr_log(GPR_INFO, "resolving_lb=%p: shutting down pending lb_policy=%p",
- this, pending_lb_policy_.get());
- }
- grpc_pollset_set_del_pollset_set(pending_lb_policy_->interested_parties(),
- interested_parties());
- pending_lb_policy_.reset();
- }
}
}
void ResolvingLoadBalancingPolicy::ExitIdleLocked() {
- if (lb_policy_ != nullptr) {
- lb_policy_->ExitIdleLocked();
- if (pending_lb_policy_ != nullptr) pending_lb_policy_->ExitIdleLocked();
- } else {
- if (!started_resolving_ && resolver_ != nullptr) {
- StartResolvingLocked();
- }
- }
+ if (lb_policy_ != nullptr) lb_policy_->ExitIdleLocked();
}
void ResolvingLoadBalancingPolicy::ResetBackoffLocked() {
resolver_->RequestReresolutionLocked();
}
if (lb_policy_ != nullptr) lb_policy_->ResetBackoffLocked();
- if (pending_lb_policy_ != nullptr) pending_lb_policy_->ResetBackoffLocked();
-}
-
-void ResolvingLoadBalancingPolicy::FillChildRefsForChannelz(
- channelz::ChildRefsList* child_subchannels,
- channelz::ChildRefsList* child_channels) {
- // Delegate to the lb_policy_ to fill the children subchannels.
- // This must be done holding lb_policy_mu_, since this method does not
- // run in the combiner.
- MutexLock lock(&lb_policy_mu_);
- if (lb_policy_ != nullptr) {
- lb_policy_->FillChildRefsForChannelz(child_subchannels, child_channels);
- }
- if (pending_lb_policy_ != nullptr) {
- pending_lb_policy_->FillChildRefsForChannelz(child_subchannels,
- child_channels);
- }
-}
-
-void ResolvingLoadBalancingPolicy::StartResolvingLocked() {
- if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
- gpr_log(GPR_INFO, "resolving_lb=%p: starting name resolution", this);
- }
- GPR_ASSERT(!started_resolving_);
- started_resolving_ = true;
- channel_control_helper()->UpdateState(
- GRPC_CHANNEL_CONNECTING,
- UniquePtr<SubchannelPicker>(New<QueuePicker>(Ref())));
- resolver_->StartLocked();
}
void ResolvingLoadBalancingPolicy::OnResolverError(grpc_error* error) {
if (lb_policy_ == nullptr) {
grpc_error* state_error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
"Resolver transient failure", &error, 1);
+ helper_->ResolverTransientFailure(GRPC_ERROR_REF(state_error));
channel_control_helper()->UpdateState(
- GRPC_CHANNEL_TRANSIENT_FAILURE,
- UniquePtr<SubchannelPicker>(New<TransientFailurePicker>(state_error)));
+ GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_to_absl_status(state_error),
+ absl::make_unique<TransientFailurePicker>(state_error));
}
GRPC_ERROR_UNREF(error);
}
void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked(
- const char* lb_policy_name,
- RefCountedPtr<ParsedLoadBalancingConfig> lb_policy_config,
- Resolver::Result result, TraceStringVector* trace_strings) {
- // If the child policy name changes, we need to create a new child
- // policy. When this happens, we leave child_policy_ as-is and store
- // the new child policy in pending_child_policy_. Once the new child
- // policy transitions into state READY, we swap it into child_policy_,
- // replacing the original child policy. So pending_child_policy_ is
- // non-null only between when we apply an update that changes the child
- // policy name and when the new child reports state READY.
- //
- // Updates can arrive at any point during this transition. We always
- // apply updates relative to the most recently created child policy,
- // even if the most recent one is still in pending_child_policy_. This
- // is true both when applying the updates to an existing child policy
- // and when determining whether we need to create a new policy.
- //
- // As a result of this, there are several cases to consider here:
- //
- // 1. We have no existing child policy (i.e., we have started up but
- // have not yet received a serverlist from the balancer or gone
- // into fallback mode; in this case, both child_policy_ and
- // pending_child_policy_ are null). In this case, we create a
- // new child policy and store it in child_policy_.
- //
- // 2. We have an existing child policy and have no pending child policy
- // from a previous update (i.e., either there has not been a
- // previous update that changed the policy name, or we have already
- // finished swapping in the new policy; in this case, child_policy_
- // is non-null but pending_child_policy_ is null). In this case:
- // a. If child_policy_->name() equals child_policy_name, then we
- // update the existing child policy.
- // b. If child_policy_->name() does not equal child_policy_name,
- // we create a new policy. The policy will be stored in
- // pending_child_policy_ and will later be swapped into
- // child_policy_ by the helper when the new child transitions
- // into state READY.
- //
- // 3. We have an existing child policy and have a pending child policy
- // from a previous update (i.e., a previous update set
- // pending_child_policy_ as per case 2b above and that policy has
- // not yet transitioned into state READY and been swapped into
- // child_policy_; in this case, both child_policy_ and
- // pending_child_policy_ are non-null). In this case:
- // a. If pending_child_policy_->name() equals child_policy_name,
- // then we update the existing pending child policy.
- // b. If pending_child_policy->name() does not equal
- // child_policy_name, then we create a new policy. The new
- // policy is stored in pending_child_policy_ (replacing the one
- // that was there before, which will be immediately shut down)
- // and will later be swapped into child_policy_ by the helper
- // when the new child transitions into state READY.
- const bool create_policy =
- // case 1
- lb_policy_ == nullptr ||
- // case 2b
- (pending_lb_policy_ == nullptr &&
- strcmp(lb_policy_->name(), lb_policy_name) != 0) ||
- // case 3b
- (pending_lb_policy_ != nullptr &&
- strcmp(pending_lb_policy_->name(), lb_policy_name) != 0);
- LoadBalancingPolicy* policy_to_update = nullptr;
- if (create_policy) {
- // Cases 1, 2b, and 3b: create a new child policy.
- // If lb_policy_ is null, we set it (case 1), else we set
- // pending_lb_policy_ (cases 2b and 3b).
- if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
- gpr_log(GPR_INFO, "resolving_lb=%p: Creating new %schild policy %s", this,
- lb_policy_ == nullptr ? "" : "pending ", lb_policy_name);
- }
- auto new_policy =
- CreateLbPolicyLocked(lb_policy_name, *result.args, trace_strings);
- auto& lb_policy = lb_policy_ == nullptr ? lb_policy_ : pending_lb_policy_;
- {
- MutexLock lock(&lb_policy_mu_);
- lb_policy = std::move(new_policy);
- }
- policy_to_update = lb_policy.get();
- } else {
- // Cases 2a and 3a: update an existing policy.
- // If we have a pending child policy, send the update to the pending
- // policy (case 3a), else send it to the current policy (case 2a).
- policy_to_update = pending_lb_policy_ != nullptr ? pending_lb_policy_.get()
- : lb_policy_.get();
+ RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config,
+ Resolver::Result result) {
+ // Construct update.
+ UpdateArgs update_args;
+ update_args.addresses = std::move(result.addresses);
+ update_args.config = std::move(lb_policy_config);
+ // Remove the config selector from channel args so that we're not holding
+ // unnecessary refs that cause it to be destroyed somewhere other than in the
+ // WorkSerializer.
+ const char* arg_name = GRPC_ARG_CONFIG_SELECTOR;
+ update_args.args =
+ grpc_channel_args_copy_and_remove(result.args, &arg_name, 1);
+ // Create policy if needed.
+ if (lb_policy_ == nullptr) {
+ lb_policy_ = CreateLbPolicyLocked(*update_args.args);
}
- GPR_ASSERT(policy_to_update != nullptr);
// Update the policy.
if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
- gpr_log(GPR_INFO, "resolving_lb=%p: Updating %schild policy %p", this,
- policy_to_update == pending_lb_policy_.get() ? "pending " : "",
- policy_to_update);
+ gpr_log(GPR_INFO, "resolving_lb=%p: Updating child policy %p", this,
+ lb_policy_.get());
}
- UpdateArgs update_args;
- update_args.addresses = std::move(result.addresses);
- update_args.config = std::move(lb_policy_config);
- // TODO(roth): Once channel args is converted to C++, use std::move() here.
- update_args.args = result.args;
- result.args = nullptr;
- policy_to_update->UpdateLocked(std::move(update_args));
+ lb_policy_->UpdateLocked(std::move(update_args));
}
// Creates a new LB policy.
-// Updates trace_strings to indicate what was done.
OrphanablePtr<LoadBalancingPolicy>
ResolvingLoadBalancingPolicy::CreateLbPolicyLocked(
- const char* lb_policy_name, const grpc_channel_args& args,
- TraceStringVector* trace_strings) {
- ResolvingControlHelper* helper = New<ResolvingControlHelper>(Ref());
+ const grpc_channel_args& args) {
LoadBalancingPolicy::Args lb_policy_args;
- lb_policy_args.combiner = combiner();
+ lb_policy_args.work_serializer = work_serializer();
lb_policy_args.channel_control_helper =
- UniquePtr<ChannelControlHelper>(helper);
+ absl::make_unique<ResolvingControlHelper>(Ref());
lb_policy_args.args = &args;
OrphanablePtr<LoadBalancingPolicy> lb_policy =
- LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy(
- lb_policy_name, std::move(lb_policy_args));
- if (GPR_UNLIKELY(lb_policy == nullptr)) {
- gpr_log(GPR_ERROR, "could not create LB policy \"%s\"", lb_policy_name);
- if (channelz_node() != nullptr) {
- char* str;
- gpr_asprintf(&str, "Could not create LB policy \"%s\"", lb_policy_name);
- trace_strings->push_back(str);
- }
- return nullptr;
- }
- helper->set_child(lb_policy.get());
+ MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args), tracer_);
if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
- gpr_log(GPR_INFO, "resolving_lb=%p: created new LB policy \"%s\" (%p)",
- this, lb_policy_name, lb_policy.get());
- }
- if (channelz_node() != nullptr) {
- char* str;
- gpr_asprintf(&str, "Created new LB policy \"%s\"", lb_policy_name);
- trace_strings->push_back(str);
- }
- // Propagate channelz node.
- auto* channelz = channelz_node();
- if (channelz != nullptr) {
- lb_policy->set_channelz_node(channelz->Ref());
+ gpr_log(GPR_INFO, "resolving_lb=%p: created new LB policy %p", this,
+ lb_policy.get());
}
grpc_pollset_set_add_pollset_set(lb_policy->interested_parties(),
interested_parties());
bool resolution_contains_addresses, TraceStringVector* trace_strings) {
if (!resolution_contains_addresses &&
previous_resolution_contained_addresses_) {
- trace_strings->push_back(gpr_strdup("Address list became empty"));
+ trace_strings->push_back("Address list became empty");
} else if (resolution_contains_addresses &&
!previous_resolution_contained_addresses_) {
- trace_strings->push_back(gpr_strdup("Address list became non-empty"));
+ trace_strings->push_back("Address list became non-empty");
}
previous_resolution_contained_addresses_ = resolution_contains_addresses;
}
void ResolvingLoadBalancingPolicy::ConcatenateAndAddChannelTraceLocked(
- TraceStringVector* trace_strings) const {
- if (!trace_strings->empty()) {
- gpr_strvec v;
- gpr_strvec_init(&v);
- gpr_strvec_add(&v, gpr_strdup("Resolution event: "));
- bool is_first = 1;
- for (size_t i = 0; i < trace_strings->size(); ++i) {
- if (!is_first) gpr_strvec_add(&v, gpr_strdup(", "));
- is_first = false;
- gpr_strvec_add(&v, (*trace_strings)[i]);
- }
- char* flat;
- size_t flat_len = 0;
- flat = gpr_strvec_flatten(&v, &flat_len);
- channelz_node()->AddTraceEvent(channelz::ChannelTrace::Severity::Info,
- grpc_slice_new(flat, flat_len, gpr_free));
- gpr_strvec_destroy(&v);
+ const TraceStringVector& trace_strings) const {
+ if (!trace_strings.empty()) {
+ std::string message =
+ absl::StrCat("Resolution event: ", absl::StrJoin(trace_strings, ", "));
+ channel_control_helper()->AddTraceEvent(ChannelControlHelper::TRACE_INFO,
+ message);
}
}
//
// We track a list of strings to eventually be concatenated and traced.
TraceStringVector trace_strings;
- const bool resolution_contains_addresses = result.addresses.size() > 0;
- // Process the resolver result.
- const char* lb_policy_name = nullptr;
- RefCountedPtr<ParsedLoadBalancingConfig> lb_policy_config;
- bool service_config_changed = false;
- char* service_config_error_string = nullptr;
- if (process_resolver_result_ != nullptr) {
- grpc_error* service_config_error = GRPC_ERROR_NONE;
- service_config_changed = process_resolver_result_(
- process_resolver_result_user_data_, result, &lb_policy_name,
- &lb_policy_config, &service_config_error);
- if (service_config_error != GRPC_ERROR_NONE) {
- service_config_error_string =
- gpr_strdup(grpc_error_string(service_config_error));
- if (lb_policy_name == nullptr) {
- // Use an empty lb_policy_name as an indicator that we received an
- // invalid service config and we don't have a fallback service config.
- OnResolverError(service_config_error);
- } else {
- GRPC_ERROR_UNREF(service_config_error);
- }
- }
+ MaybeAddTraceMessagesForAddressChangesLocked(!result.addresses.empty(),
+ &trace_strings);
+ // The result of grpc_error_string() is owned by the error itself.
+ // We're storing that string in trace_strings, so we need to make sure
+ // that the error lives until we're done with the string.
+ grpc_error* service_config_error =
+ GRPC_ERROR_REF(result.service_config_error);
+ if (service_config_error != GRPC_ERROR_NONE) {
+ trace_strings.push_back(grpc_error_string(service_config_error));
+ }
+ // Choose the service config.
+ ChannelConfigHelper::ChooseServiceConfigResult service_config_result;
+ if (helper_ != nullptr) {
+ service_config_result = helper_->ChooseServiceConfig(result);
} else {
- lb_policy_name = child_policy_name_.get();
- lb_policy_config = child_lb_config_;
+ service_config_result.lb_policy_config = child_lb_config_;
}
- if (lb_policy_name != nullptr) {
+ if (service_config_result.no_valid_service_config) {
+ // We received an invalid service config and we don't have a
+ // previous service config to fall back to.
+ OnResolverError(GRPC_ERROR_REF(service_config_error));
+ trace_strings.push_back("no valid service config");
+ } else {
// Create or update LB policy, as needed.
- CreateOrUpdateLbPolicyLocked(lb_policy_name, lb_policy_config,
- std::move(result), &trace_strings);
- }
- // Add channel trace event.
- if (channelz_node() != nullptr) {
- if (service_config_changed) {
+ CreateOrUpdateLbPolicyLocked(
+ std::move(service_config_result.lb_policy_config), std::move(result));
+ if (service_config_result.service_config_changed) {
+ // Tell channel to start using new service config for calls.
+ // This needs to happen after the LB policy has been updated, since
+ // the ConfigSelector may need the LB policy to know about new
+ // destinations before it can send RPCs to those destinations.
+ if (helper_ != nullptr) helper_->StartUsingServiceConfigForCalls();
// TODO(ncteisen): might be worth somehow including a snippet of the
// config in the trace, at the risk of bloating the trace logs.
- trace_strings.push_back(gpr_strdup("Service config changed"));
+ trace_strings.push_back("Service config changed");
}
- if (service_config_error_string != nullptr) {
- trace_strings.push_back(service_config_error_string);
- service_config_error_string = nullptr;
- }
- MaybeAddTraceMessagesForAddressChangesLocked(resolution_contains_addresses,
- &trace_strings);
- ConcatenateAndAddChannelTraceLocked(&trace_strings);
}
- gpr_free(service_config_error_string);
+ // Add channel trace event.
+ ConcatenateAndAddChannelTraceLocked(trace_strings);
+ GRPC_ERROR_UNREF(service_config_error);
}
} // namespace grpc_core
projects / platform / upstream / grpc.git / blobdiff