|
|
|
@ -106,13 +106,10 @@ class ResolvingLoadBalancingPolicy::ResolvingControlHelper |
|
|
|
RefCountedPtr<ResolvingLoadBalancingPolicy> parent) |
|
|
|
RefCountedPtr<ResolvingLoadBalancingPolicy> parent) |
|
|
|
: parent_(std::move(parent)) {} |
|
|
|
: parent_(std::move(parent)) {} |
|
|
|
|
|
|
|
|
|
|
|
Subchannel* CreateSubchannel( |
|
|
|
Subchannel* CreateSubchannel(const grpc_channel_args& args) override { |
|
|
|
const grpc_channel_args& args, |
|
|
|
|
|
|
|
const HealthCheckParsedObject* health_check) override { |
|
|
|
|
|
|
|
if (parent_->resolver_ == nullptr) return nullptr; // Shutting down.
|
|
|
|
if (parent_->resolver_ == nullptr) return nullptr; // Shutting down.
|
|
|
|
if (!CalledByCurrentChild() && !CalledByPendingChild()) return nullptr; |
|
|
|
if (!CalledByCurrentChild() && !CalledByPendingChild()) return nullptr; |
|
|
|
return parent_->channel_control_helper()->CreateSubchannel(args, |
|
|
|
return parent_->channel_control_helper()->CreateSubchannel(args); |
|
|
|
health_check); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
grpc_channel* CreateChannel(const char* target, |
|
|
|
grpc_channel* CreateChannel(const char* target, |
|
|
|
@ -336,8 +333,7 @@ void ResolvingLoadBalancingPolicy::OnResolverError(grpc_error* error) { |
|
|
|
void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked( |
|
|
|
void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked( |
|
|
|
const char* lb_policy_name, |
|
|
|
const char* lb_policy_name, |
|
|
|
const ParsedLoadBalancingConfig* lb_policy_config, Resolver::Result result, |
|
|
|
const ParsedLoadBalancingConfig* lb_policy_config, Resolver::Result result, |
|
|
|
TraceStringVector* trace_strings, |
|
|
|
TraceStringVector* trace_strings) { |
|
|
|
const HealthCheckParsedObject* health_check) { |
|
|
|
|
|
|
|
// If the child policy name changes, we need to create a new child
|
|
|
|
// 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
|
|
|
|
// policy. When this happens, we leave child_policy_ as-is and store
|
|
|
|
// the new child policy in pending_child_policy_. Once the new child
|
|
|
|
// the new child policy in pending_child_policy_. Once the new child
|
|
|
|
@ -430,7 +426,6 @@ void ResolvingLoadBalancingPolicy::CreateOrUpdateLbPolicyLocked( |
|
|
|
UpdateArgs update_args; |
|
|
|
UpdateArgs update_args; |
|
|
|
update_args.addresses = std::move(result.addresses); |
|
|
|
update_args.addresses = std::move(result.addresses); |
|
|
|
update_args.config = std::move(lb_policy_config); |
|
|
|
update_args.config = std::move(lb_policy_config); |
|
|
|
update_args.health_check = health_check; |
|
|
|
|
|
|
|
// TODO(roth): Once channel args is converted to C++, use std::move() here.
|
|
|
|
// TODO(roth): Once channel args is converted to C++, use std::move() here.
|
|
|
|
update_args.args = result.args; |
|
|
|
update_args.args = result.args; |
|
|
|
result.args = nullptr; |
|
|
|
result.args = nullptr; |
|
|
|
@ -535,12 +530,11 @@ void ResolvingLoadBalancingPolicy::OnResolverResultChangedLocked( |
|
|
|
// Process the resolver result.
|
|
|
|
// Process the resolver result.
|
|
|
|
const char* lb_policy_name = nullptr; |
|
|
|
const char* lb_policy_name = nullptr; |
|
|
|
const ParsedLoadBalancingConfig* lb_policy_config = nullptr; |
|
|
|
const ParsedLoadBalancingConfig* lb_policy_config = nullptr; |
|
|
|
const HealthCheckParsedObject* health_check = nullptr; |
|
|
|
|
|
|
|
bool service_config_changed = false; |
|
|
|
bool service_config_changed = false; |
|
|
|
if (process_resolver_result_ != nullptr) { |
|
|
|
if (process_resolver_result_ != nullptr) { |
|
|
|
service_config_changed = process_resolver_result_( |
|
|
|
service_config_changed = |
|
|
|
process_resolver_result_user_data_, result, &lb_policy_name, |
|
|
|
process_resolver_result_(process_resolver_result_user_data_, result, |
|
|
|
&lb_policy_config, &health_check); |
|
|
|
&lb_policy_name, &lb_policy_config); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
lb_policy_name = child_policy_name_.get(); |
|
|
|
lb_policy_name = child_policy_name_.get(); |
|
|
|
lb_policy_config = child_lb_config_; |
|
|
|
lb_policy_config = child_lb_config_; |
|
|
|
@ -548,7 +542,7 @@ void ResolvingLoadBalancingPolicy::OnResolverResultChangedLocked( |
|
|
|
GPR_ASSERT(lb_policy_name != nullptr); |
|
|
|
GPR_ASSERT(lb_policy_name != nullptr); |
|
|
|
// Create or update LB policy, as needed.
|
|
|
|
// Create or update LB policy, as needed.
|
|
|
|
CreateOrUpdateLbPolicyLocked(lb_policy_name, lb_policy_config, |
|
|
|
CreateOrUpdateLbPolicyLocked(lb_policy_name, lb_policy_config, |
|
|
|
std::move(result), &trace_strings, health_check); |
|
|
|
std::move(result), &trace_strings); |
|
|
|
// Add channel trace event.
|
|
|
|
// Add channel trace event.
|
|
|
|
if (channelz_node() != nullptr) { |
|
|
|
if (channelz_node() != nullptr) { |
|
|
|
if (service_config_changed) { |
|
|
|
if (service_config_changed) { |
|
|
|
|
Yash Tibrewal
6 years ago