Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Rls] de-experimentalize RLS in XDS #33290

Merged
merged 5 commits into from
Jun 2, 2023
Merged

[Rls] de-experimentalize RLS in XDS #33290

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4520be
[XDS RLS] de-experimentalize RLS in XDS
apolcyn May 31, 2023
958ac48
explicitly disable env var in a test
apolcyn May 31, 2023
2352b18
fix test
apolcyn May 31, 2023
6bfee50
update todo
apolcyn Jun 1, 2023
6cd0e9d
fix sanity
apolcyn Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/core/ext/xds/xds_route_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@

namespace grpc_core {

// TODO(donnadionne): Remove once RLS is no longer experimental
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This TODO needs to stay, although you can change the assignee. We still want to get rid of this env var guard before too long.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SG, I suspect this env var will be useful at least for upcoming weeks while we iron out possible RLS issues beyond the client.

Updated the comment to remove by 1.58

bool XdsRlsEnabled() {
auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB");
if (!value.has_value()) return false;
if (!value.has_value()) return true;
bool parsed_value;
bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
return parse_succeeded && parsed_value;
Expand Down
2 changes: 2 additions & 0 deletions test/core/xds/xds_route_config_resource_type_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,6 +1886,8 @@ TEST_F(RlsTest, NotUsedInAllVirtualHosts) {
}

TEST_F(RlsTest, ClusterSpecifierPluginsIgnoredWhenNotEnabled) {
grpc_core::testing::ScopedEnvVar env_var("GRPC_EXPERIMENTAL_XDS_RLS_LB",
"false");
RouteConfiguration route_config;
route_config.set_name("foo");
auto* cluster_specifier_plugin = route_config.add_cluster_specifier_plugins();
Expand Down
2 changes: 2 additions & 0 deletions test/cpp/end2end/xds/xds_rls_end2end_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ TEST_P(RlsTest, XdsRoutingClusterSpecifierPlugin) {
}

TEST_P(RlsTest, XdsRoutingClusterSpecifierPluginDisabled) {
grpc_core::testing::ScopedEnvVar env_var("GRPC_EXPERIMENTAL_XDS_RLS_LB",
"false");
CreateAndStartBackends(1);
// Populate new EDS resources.
EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}});
Expand Down