From 34c75a2f96c2d740b4830aeb4497723ee6e0ec4e Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Wed, 16 Mar 2022 07:42:17 -0700 Subject: [PATCH] xds resolver: fix cases where we weren't returning channel args on error (#29109) --- .../ext/filters/client_channel/resolver/xds/xds_resolver.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc index 671122d7857..ca546ff1593 100644 --- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc @@ -712,6 +712,7 @@ void XdsResolver::StartLocked() { Result result; result.service_config = absl::UnavailableError( absl::StrCat("Failed to create XdsClient: ", error_message)); + result.args = grpc_channel_args_copy(args_); result_handler_->ReportResult(std::move(result)); GRPC_ERROR_UNREF(error); return; @@ -726,6 +727,7 @@ void XdsResolver::StartLocked() { result.service_config = absl::UnavailableError( absl::StrCat("Invalid target URI -- authority not found for %s.", uri_.authority().c_str())); + result.args = grpc_channel_args_copy(args_); result_handler_->ReportResult(std::move(result)); return; }