reviewable/pr18746/r5
Yash Tibrewal 6 years ago
parent 51fd073b7c
commit f7c8e8be62
  1. 4
      src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
  2. 2
      test/core/client_channel/service_config_test.cc

@ -1750,7 +1750,7 @@ void XdsLb::LocalityMap::PruneLocalities(const LocalityList& locality_list) {
void XdsLb::LocalityMap::UpdateLocked(
const LocalityList& locality_serverlist,
RefCountedPtr<ParsedLoadBalancingConfig> child_policy_config,
const RefCountedPtr<ParsedLoadBalancingConfig>& child_policy_config,
const grpc_channel_args* args, XdsLb* parent) {
if (parent->shutting_down_) return;
for (size_t i = 0; i < locality_serverlist.size(); i++) {
@ -1845,7 +1845,7 @@ XdsLb::LocalityMap::LocalityEntry::CreateChildPolicyLocked(
void XdsLb::LocalityMap::LocalityEntry::UpdateLocked(
xds_grpclb_serverlist* serverlist,
RefCountedPtr<ParsedLoadBalancingConfig> child_policy_config,
const RefCountedPtr<ParsedLoadBalancingConfig>& child_policy_config,
const grpc_channel_args* args_in) {
if (parent_->shutting_down_) return;
// Construct update args.

@ -137,7 +137,7 @@ class ErrorParser : public ServiceConfig::Parser {
static const char* GlobalError() { return "ErrorParser : globalError"; }
};
void VerifyRegexMatch(grpc_error* error, std::regex e) {
void VerifyRegexMatch(grpc_error* error, const std::regex& e) {
std::smatch match;
std::string s(grpc_error_string(error));
EXPECT_TRUE(std::regex_search(s, match, e));

Loading…
Cancel
Save