From 34a6d43298d2654585e35c4984c5d43785886975 Mon Sep 17 00:00:00 2001 From: cb-robot <8571829+cb-robot@users.noreply.github.com> Date: Mon, 5 Jan 2026 12:55:37 +0000 Subject: [PATCH] Automated change: Fix sanity tests --- src/core/client_channel/client_channel.cc | 2 +- .../client_channel/client_channel_filter.cc | 2 +- src/core/load_balancing/endpoint_list.h | 4 +- src/core/load_balancing/grpclb/grpclb.cc | 4 +- .../outlier_detection/outlier_detection.cc | 38 +++++++++---------- .../load_balancing/pick_first/pick_first.cc | 6 +-- .../load_balancing/ring_hash/ring_hash.cc | 6 +-- .../weighted_round_robin.cc | 3 +- .../load_balancing/xds/xds_cluster_impl.cc | 4 +- .../load_balancing/xds/xds_override_host.cc | 9 ++--- .../resolver/dns/c_ares/dns_resolver_ares.cc | 6 +-- .../event_engine_client_channel_resolver.cc | 3 +- src/core/resolver/endpoint_addresses.cc | 9 ++--- src/core/resolver/endpoint_addresses.h | 10 ++--- src/core/xds/grpc/xds_endpoint_parser.cc | 14 +++---- test/core/load_balancing/bm_picker.cc | 4 +- test/core/load_balancing/lb_policy_test_lib.h | 10 ++--- test/core/load_balancing/pick_first_fuzzer.cc | 15 +++----- test/core/test_util/test_lb_policies.cc | 8 ++-- test/cpp/end2end/rls_end2end_test.cc | 7 ++-- .../xds/xds_override_host_end2end_test.cc | 5 +-- 21 files changed, 77 insertions(+), 92 deletions(-) diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 6a7280a46951b..9426309ee4520 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -491,7 +491,7 @@ class ClientChannel::ClientChannelControlHelper args, per_address_args, client_channel_->subchannel_pool_, client_channel_->default_authority_); // Create subchannel. - auto uri = grpc_core::URI::Parse(address); + auto uri = URI::Parse(address); if (!uri.ok()) { LOG(ERROR) << "Failed to parse address URI: " << address; return nullptr; diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 213466ebf86e4..8d8e429dea36f 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -906,7 +906,7 @@ class ClientChannelFilter::ClientChannelControlHelper final args, per_address_args, chand_->subchannel_pool_, chand_->default_authority_); // Create subchannel. - auto uri = grpc_core::URI::Parse(address_uri); + auto uri = URI::Parse(address_uri); if (!uri.ok()) { LOG(ERROR) << "Failed to parse address URI: " << address_uri; return nullptr; diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index 67e0c0484028d..18fe9bcf804c4 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -157,8 +157,8 @@ class EndpointList : public InternallyRefCounted { // Called to create a subchannel. Subclasses may override. virtual RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args); + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args); RefCountedPtr endpoint_list_; diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index b5bf5ff441365..3e22fe45c9db2 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -453,8 +453,8 @@ class GrpcLb final : public LoadBalancingPolicy { : ParentOwningDelegatingChannelControlHelper(std::move(parent)) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override; + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override; void UpdateState(grpc_connectivity_state state, const absl::Status& status, RefCountedPtr picker) override; void RequestReresolution() override; diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index 3ec4a2ca190e5..33d955c38a3ec 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -379,21 +379,21 @@ class OutlierDetectionLb final : public LoadBalancingPolicy { bool counting_enabled_; }; -class Helper final - : public ParentOwningDelegatingChannelControlHelper { - public: - explicit Helper(RefCountedPtr outlier_detection_policy) - : ParentOwningDelegatingChannelControlHelper( - std::move(outlier_detection_policy)) {} - - RefCountedPtr CreateSubchannel( - const std::string& address, const ChannelArgs& per_address_args, - const ChannelArgs& args) override; - void UpdateState(grpc_connectivity_state state, const absl::Status& status, - // ignored. The child will be re-created and will report - // its own new picker. - RefCountedPtr picker) override; -}; + class Helper final + : public ParentOwningDelegatingChannelControlHelper { + public: + explicit Helper(RefCountedPtr outlier_detection_policy) + : ParentOwningDelegatingChannelControlHelper( + std::move(outlier_detection_policy)) {} + + RefCountedPtr CreateSubchannel( + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override; + void UpdateState(grpc_connectivity_state state, const absl::Status& status, + // ignored. The child will be re-created and will report + // its own new picker. + RefCountedPtr picker) override; + }; class EjectionTimer final : public InternallyRefCounted { public: @@ -435,8 +435,7 @@ class Helper final RefCountedPtr picker_; std::map> endpoint_state_map_; - std::map, - StringLessThan> + std::map, StringLessThan> subchannel_state_map_; OrphanablePtr ejection_timer_; }; @@ -746,8 +745,9 @@ OrphanablePtr OutlierDetectionLb::CreateChildPolicyLocked( LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.work_serializer = work_serializer(); lb_policy_args.args = args; - lb_policy_args.channel_control_helper = std::make_unique( - RefAsSubclass(DEBUG_LOCATION, "Helper")); + lb_policy_args.channel_control_helper = + std::make_unique( + RefAsSubclass(DEBUG_LOCATION, "Helper")); OrphanablePtr lb_policy = MakeOrphanable(std::move(lb_policy_args), &outlier_detection_lb_trace); diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 63cae91c3ff4a..b016c672e2433 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -14,9 +14,7 @@ // limitations under the License. // -#include "src/core/lib/address_utils/parse_address.h" #include "src/core/load_balancing/pick_first/pick_first.h" -#include "src/core/util/uri.h" #include #include @@ -34,6 +32,7 @@ #include #include "src/core/config/core_configuration.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" @@ -58,6 +57,7 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/shared_bit_gen.h" #include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" #include "src/core/util/work_serializer.h" #include "absl/algorithm/container.h" @@ -484,7 +484,7 @@ void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() { } std::string GetAddressFamily(absl::string_view address_uri) { - auto uri = grpc_core::URI::Parse(address_uri); + auto uri = URI::Parse(address_uri); if (!uri.ok()) { return "other"; } diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index abf310045bdc0..efd9085c59aa6 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -34,6 +34,7 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/config/core_configuration.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" @@ -69,7 +70,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/address_utils/parse_address.h" namespace grpc_core { @@ -455,10 +455,10 @@ RingHash::Ring::Ring(RingHash* ring_hash, RingHashLbConfig* config) { if (hash_key.has_value()) { endpoint_weight.hash_key = std::string(*hash_key); } else { - auto uri = grpc_core::URI::Parse(endpoint.addresses().front()); + auto uri = URI::Parse(endpoint.addresses().front()); CHECK(uri.ok()) << "Failed to parse URI: " << endpoint.addresses().front() << " with status: " << uri.status(); - grpc_resolved_address resolved_addr; + grpc_resolved_address resolved_addr; CHECK(grpc_parse_uri(*uri, &resolved_addr)) << "Failed to convert URI to resolved address: " << endpoint.addresses().front(); diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index 3ece3fb18774a..7124a9372e663 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -265,8 +265,7 @@ class WeightedRoundRobin final : public LoadBalancingPolicy { }; RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, + const std::string& address, const ChannelArgs& per_address_args, const ChannelArgs& args) override; // Called when the child policy reports a connectivity state update. diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index f72e76182a3da..9daa3f0cd5988 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -260,8 +260,8 @@ class XdsClusterImplLb final : public LoadBalancingPolicy { std::move(xds_cluster_impl_policy)) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override; + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override; void UpdateState(grpc_connectivity_state state, const absl::Status& status, RefCountedPtr picker) override; }; diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 1ab90811f9f66..275973733d2c6 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -345,8 +345,8 @@ class XdsOverrideHostLb final : public LoadBalancingPolicy { std::move(xds_override_host_policy)) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override; + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override; void UpdateState(grpc_connectivity_state state, const absl::Status& status, RefCountedPtr picker) override; }; @@ -805,7 +805,7 @@ void XdsOverrideHostLb::UpdateAddressMap( std::vector addresses; addresses.reserve(endpoint.addresses().size()); for (const auto& address : endpoint.addresses()) { - addresses.push_back(std::move(address)); + addresses.push_back(address); } absl::Span addresses_span = addresses; for (size_t i = 0; i < addresses.size(); ++i) { @@ -873,8 +873,7 @@ void XdsOverrideHostLb::UpdateAddressMap( RefCountedPtr XdsOverrideHostLb::AdoptSubchannel( - const std::string& address, - RefCountedPtr subchannel) { + const std::string& address, RefCountedPtr subchannel) { auto wrapper = MakeRefCounted( std::move(subchannel), RefAsSubclass()); // Drop ref to previously owned subchannel (if any) after releasing diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index a67cf7ebd2658..3564b897a28d3 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -58,10 +58,10 @@ #include #include "src/core/config/config_vars.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/address_utils/parse_address.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" @@ -531,7 +531,7 @@ class AresDNSResolver final : public DNSResolver { resolved_addresses.reserve(addresses_->size()); for (const auto& server_address : *addresses_) { grpc_resolved_address resolved_address; - auto uri = grpc_core::URI::Parse(server_address.address()); + auto uri = URI::Parse(server_address.address()); if (!uri.ok() || !grpc_parse_uri(*uri, &resolved_address)) { LOG(ERROR) << "Failed to parse address: " << server_address.address(); @@ -590,7 +590,7 @@ class AresDNSResolver final : public DNSResolver { if (balancer_addresses_ != nullptr) { resolved_addresses.reserve(balancer_addresses_->size()); for (const auto& server_address : *balancer_addresses_) { - auto uri = grpc_core::URI::Parse(server_address.address()); + auto uri = URI::Parse(server_address.address()); grpc_resolved_address resolved_address; if (!uri.ok() || !grpc_parse_uri(*uri, &resolved_address)) { LOG(ERROR) << "Failed to parse address: " diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index c18e93cbf215a..9ddda0d80af62 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -419,8 +419,7 @@ void EventEngineClientChannelDNSResolver::EventEngineDNSRequestWrapper:: errors_.AddError(uri.status().message()); continue; } - balancer_addresses_.emplace_back(*uri, - srv_channel_args); + balancer_addresses_.emplace_back(*uri, srv_channel_args); } } result = OnResolvedLocked(); diff --git a/src/core/resolver/endpoint_addresses.cc b/src/core/resolver/endpoint_addresses.cc index 04cb6c306f303..aaeb88dfc25e3 100644 --- a/src/core/resolver/endpoint_addresses.cc +++ b/src/core/resolver/endpoint_addresses.cc @@ -42,8 +42,8 @@ EndpointAddresses::EndpointAddresses(const std::string& address, const ChannelArgs& args) : addresses_(1, address), args_(args) {} -EndpointAddresses::EndpointAddresses( - std::vector addresses, const ChannelArgs& args) +EndpointAddresses::EndpointAddresses(std::vector addresses, + const ChannelArgs& args) : addresses_(std::move(addresses)), args_(args) { GRPC_CHECK(!addresses_.empty()); } @@ -88,9 +88,8 @@ std::string EndpointAddresses::ToString() const { return absl::StrJoin(parts, " "); } -bool StringLessThan::operator()( - const std::string& str1, - const std::string& str2) const { +bool StringLessThan::operator()(const std::string& str1, + const std::string& str2) const { return str1 < str2; } diff --git a/src/core/resolver/endpoint_addresses.h b/src/core/resolver/endpoint_addresses.h index 5fb65f0a4a7ee..6e5a22b8caaed 100644 --- a/src/core/resolver/endpoint_addresses.h +++ b/src/core/resolver/endpoint_addresses.h @@ -83,9 +83,7 @@ class EndpointAddresses final { // TODO(roth): Remove when all callers have been updated. const std::string& address() const { return addresses_[0]; } - const std::vector& addresses() const { - return addresses_; - } + const std::vector& addresses() const { return addresses_; } const ChannelArgs& args() const { return args_; } // TODO(ctiller): Prior to making this a public API we should ensure that the @@ -101,14 +99,12 @@ class EndpointAddresses final { using EndpointAddressesList = std::vector; struct StringLessThan { - bool operator()(const std::string& str1, - const std::string& str2) const; + bool operator()(const std::string& str1, const std::string& str2) const; }; class EndpointAddressSet final { public: - explicit EndpointAddressSet( - const std::vector& addresses) + explicit EndpointAddressSet(const std::vector& addresses) : addresses_(addresses.begin(), addresses.end()) {} bool operator==(const EndpointAddressSet& other) const; diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc index 3b48df29647a4..2d7cc213682d8 100644 --- a/src/core/xds/grpc/xds_endpoint_parser.cc +++ b/src/core/xds/grpc/xds_endpoint_parser.cc @@ -227,10 +227,9 @@ struct ParsedLocality { }; struct StringLessThan { - bool operator()(const std::string& str1, - const std::string& str2) const { - auto uri_a = grpc_core::URI::Parse(str1); - auto uri_b = grpc_core::URI::Parse(str2); + bool operator()(const std::string& str1, const std::string& str2) const { + auto uri_a = URI::Parse(str1); + auto uri_b = URI::Parse(str2); if (!uri_a.ok() || !uri_b.ok()) { return str1 < str2; } @@ -243,8 +242,7 @@ struct StringLessThan { return memcmp(addr_a.addr, addr_b.addr, addr_a.len) < 0; } }; -using AddressSet = - std::set; +using AddressSet = std::set; std::optional LocalityParse( const XdsResourceType::DecodeContext& context, @@ -305,8 +303,8 @@ std::optional LocalityParse( for (const auto& address : endpoint->addresses()) { bool inserted = address_set->insert(address).second; if (!inserted) { - errors->AddError(absl::StrCat( - "duplicate endpoint address \"", address, "\"")); + errors->AddError( + absl::StrCat("duplicate endpoint address \"", address, "\"")); } } parsed_locality.locality.endpoints.push_back(std::move(*endpoint)); diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc index 0d62ae024dcd5..f4e4ab951542a 100644 --- a/test/core/load_balancing/bm_picker.cc +++ b/test/core/load_balancing/bm_picker.cc @@ -139,8 +139,8 @@ class BenchmarkHelper : public std::enable_shared_from_this { explicit LbHelper(BenchmarkHelper* helper) : helper_(helper) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override { + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override { return MakeRefCounted(helper_); } diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 36aa71ac41912..35448bf58b0a9 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -512,17 +512,17 @@ class LoadBalancingPolicyTest : public ::testing::Test { } RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& /*per_address_args*/, + const std::string& address, const ChannelArgs& /*per_address_args*/, const ChannelArgs& args) override { // TODO(roth): Need to use per_address_args here. - SubchannelKey key(MakeAddress(address), args.RemoveAllKeysWithPrefix( - GRPC_ARG_NO_SUBCHANNEL_PREFIX)); + SubchannelKey key( + MakeAddress(address), + args.RemoveAllKeysWithPrefix(GRPC_ARG_NO_SUBCHANNEL_PREFIX)); auto it = test_->subchannel_pool_.find(key); if (it == test_->subchannel_pool_.end()) { it = test_->subchannel_pool_ .emplace(std::piecewise_construct, std::forward_as_tuple(key), - std::forward_as_tuple(std::move(address), test_)) + std::forward_as_tuple(address, test_)) .first; } return it->second.CreateSubchannel(); diff --git a/test/core/load_balancing/pick_first_fuzzer.cc b/test/core/load_balancing/pick_first_fuzzer.cc index 49565f36fcd64..b5140c7f20184 100644 --- a/test/core/load_balancing/pick_first_fuzzer.cc +++ b/test/core/load_balancing/pick_first_fuzzer.cc @@ -457,11 +457,10 @@ class Fuzzer { private: RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& /*per_address_args*/, + const std::string& address, const ChannelArgs& /*per_address_args*/, const ChannelArgs& args) override { // TODO(roth): Need to use per_address_args here. - auto uri = grpc_core::URI::Parse(address); + auto uri = URI::Parse(address); if (!uri.ok()) return nullptr; grpc_resolved_address resolved_addr; if (!grpc_parse_uri(*uri, &resolved_addr)) return nullptr; @@ -470,9 +469,8 @@ class Fuzzer { auto it = fuzzer_->subchannel_pool_.find(key); if (it == fuzzer_->subchannel_pool_.end()) { it = fuzzer_->subchannel_pool_ - .emplace( - std::piecewise_construct, std::forward_as_tuple(key), - std::forward_as_tuple(std::move(address), fuzzer_)) + .emplace(std::piecewise_construct, std::forward_as_tuple(key), + std::forward_as_tuple(address, fuzzer_)) .first; } return it->second.CreateSubchannel(); @@ -638,8 +636,7 @@ class Fuzzer { return update_args; } - static std::optional MakeAddress( - absl::string_view address_uri) { + static std::optional MakeAddress(absl::string_view address_uri) { auto uri = URI::Parse(address_uri); if (!uri.ok()) return std::nullopt; grpc_resolved_address resolved_address; @@ -714,7 +711,7 @@ class Fuzzer { if (!address.has_value()) return; ChannelArgs args = CreateChannelArgsFromFuzzingConfiguration( notification.channel_args(), FuzzingEnvironment()); - auto uri = grpc_core::URI::Parse(*address_uri); + auto uri = URI::Parse(*address_uri); if (!uri.ok()) return; grpc_resolved_address resolved_address; if (!grpc_parse_uri(*uri, &resolved_address)) return; diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index 952c1034b1239..d455ade36734a 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -340,8 +340,8 @@ class AddressTestLoadBalancingPolicy : public ForwardingLoadBalancingPolicy { cb_(std::move(cb)) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override { + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override { cb_(EndpointAddresses(address, per_address_args)); return parent_helper()->CreateSubchannel(address, per_address_args, args); } @@ -511,8 +511,8 @@ class OobBackendMetricTestLoadBalancingPolicy : ParentOwningDelegatingChannelControlHelper(std::move(parent)) {} RefCountedPtr CreateSubchannel( - const std::string& address, - const ChannelArgs& per_address_args, const ChannelArgs& args) override { + const std::string& address, const ChannelArgs& per_address_args, + const ChannelArgs& args) override { auto subchannel = parent_helper()->CreateSubchannel(address, per_address_args, args); subchannel->AddDataWatcher(MakeOobBackendMetricWatcher( diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index c54889e54de89..721bbbc780e48 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -1373,10 +1373,9 @@ TEST_F(RlsEnd2endTest, ConnectivityStateTransientFailure) { EXPECT_EQ(GRPC_CHANNEL_IDLE, channel_->GetState(/*try_to_connect=*/false)); rls_server_->service_.SetResponse(BuildRlsRequest({{kTestKey, kTestValue}}), BuildRlsResponse({"invalid_target"})); - CheckRpcSendFailure( - DEBUG_LOCATION, StatusCode::UNAVAILABLE, - "empty address list", - RpcOptions().set_metadata({{"key1", kTestValue}})); + CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::UNAVAILABLE, + "empty address list", + RpcOptions().set_metadata({{"key1", kTestValue}})); EXPECT_EQ(rls_server_->service_.request_count(), 1); EXPECT_EQ(rls_server_->service_.response_count(), 1); EXPECT_EQ(GRPC_CHANNEL_TRANSIENT_FAILURE, diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index d4d68ebe430a8..815c63d24700e 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -789,9 +789,8 @@ TEST_P(OverrideHostTest, MultipleAddressesPerEndpoint) { class OverrideHostLoadReportingTest : public OverrideHostTest { protected: std::string ConstructCookieValueForEndpoint(size_t idx) const { - return absl::Base64Escape( - absl::StrCat("ipv4:127.0.0.1:", backends_[idx]->port(), ";", - kDefaultClusterName)); + return absl::Base64Escape(absl::StrCat( + "ipv4:127.0.0.1:", backends_[idx]->port(), ";", kDefaultClusterName)); } };