clang-format

pull/22293/head
Mark D. Roth 5 years ago
parent 6b315db2ba
commit 86cbef7f72
  1. 8
      src/core/ext/filters/client_channel/xds/xds_api.cc
  2. 3
      src/core/ext/filters/client_channel/xds/xds_client.cc
  3. 6
      test/cpp/end2end/xds_end2end_test.cc

@ -655,10 +655,10 @@ grpc_error* RdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
return GRPC_ERROR_NONE;
}
grpc_error* CdsResponseParse(
const envoy_api_v2_DiscoveryResponse* response,
const std::set<StringView>& expected_cluster_names,
XdsApi::CdsUpdateMap* cds_update_map, upb_arena* arena) {
grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
const std::set<StringView>& expected_cluster_names,
XdsApi::CdsUpdateMap* cds_update_map,
upb_arena* arena) {
// Get the resources from the response.
size_t size;
const google_protobuf_Any* const* resources =

@ -930,8 +930,7 @@ void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate(
return;
}
if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
gpr_log(GPR_INFO,
"[xds_client %p] RDS update received: cluster_name=%s",
gpr_log(GPR_INFO, "[xds_client %p] RDS update received: cluster_name=%s",
xds_client(), rds_update->cluster_name.c_str());
}
auto& rds_state = state_map_[XdsApi::kRdsTypeUrl];

@ -1681,8 +1681,10 @@ TEST_P(XdsResolverOnlyTest, ChangeClusters) {
// Change RDS resource to point to new cluster.
RouteConfiguration new_route_config =
balancers_[0]->ads_service()->default_route_config();
new_route_config.mutable_virtual_hosts(0)->mutable_routes(0)
->mutable_route()->set_cluster(kNewClusterName);
new_route_config.mutable_virtual_hosts(0)
->mutable_routes(0)
->mutable_route()
->set_cluster(kNewClusterName);
Listener listener =
balancers_[0]->ads_service()->BuildListener(new_route_config);
balancers_[0]->ads_service()->SetLdsResource(listener, kDefaultResourceName);

Loading…
Cancel
Save