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.

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

XDS: enable XDS federation by default #32711

Merged
merged 12 commits into from
Mar 28, 2023
Merged

Conversation

apolcyn
Copy link
Contributor

@apolcyn apolcyn commented Mar 24, 2023

Integration tests have been green so let's enable this (verification of test results in https://b.corp.google.com/issues/262593165#comment30).

@apolcyn apolcyn requested a review from markdroth as a code owner March 24, 2023 20:45
@apolcyn apolcyn added release notes: yes Indicates if PR needs to be in release notes and removed lang/Python labels Mar 24, 2023
Copy link
Member

@markdroth markdroth left a comment

Choose a reason for hiding this comment

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

There's at least one test that will need to be changed to explicitly disable federation:

TEST_P(XdsFederationDisabledTest, FederationDisabledWithNewStyleNames) {

There may be others as well -- please make sure everything is passing with this PR.

@@ -29,7 +29,7 @@ namespace grpc_core {
// removed once federation is fully integrated and enabled by default.
Copy link
Member

Choose a reason for hiding this comment

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

Historically, in C-core, we've just completely removed the env var instead of changing the default to true, on the theory that once we pass interop tests, we have confidence that there won't be any more need to disable the feature. However, in this particular case, since we've already had a fairly serious bug with this code, it probably does make sense to be more cautious here, so I'm okay with this approach.

However, we need to remember to eventually come back and remove this completely, or else we'll just keep accumulating env var controls that we don't actually need. Please update the TODO here to indicate that this should be removed after the 1.55 release, just so that we have a target date for removing this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, updated the todo

@apolcyn
Copy link
Contributor Author

apolcyn commented Mar 27, 2023

Manually tested the previously-failed tests - they should pass now.

PTAL

TEST_F(XdsClientTest, FederationDisabledWithNewStyleName) {
// We will use this xdstp name, whose authority is not present in
// the bootstrap config. But since federation is not enabled, we
// will treat this as an opaque old-style name, so we'll send it to
// the default server.
grpc_core::testing::ScopedEnvVar env_var("GRPC_EXPERIMENTAL_XDS_FEDERATION",
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Please move this up to line 2523, so it's not between the comment above and the line that the comment refers to.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@apolcyn
Copy link
Contributor Author

apolcyn commented Mar 28, 2023

Android failure fatal error: 'src/core/lib/security/security_connector/ssl_utils_config.h' file not found is unrelated

@apolcyn apolcyn merged commit 4b46dbc into grpc:master Mar 28, 2023
1 check passed
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Mar 29, 2023
apolcyn added a commit to apolcyn/grpc that referenced this pull request Apr 5, 2023
apolcyn added a commit to apolcyn/grpc that referenced this pull request Apr 5, 2023
apolcyn added a commit that referenced this pull request Apr 6, 2023
This reverts commit 4b46dbc.

Reason: this seems to be breaking load reports in certain cases,
b/276944116

Let's revert so this doesn't accidentally get released.
apolcyn added a commit to apolcyn/grpc that referenced this pull request Apr 6, 2023
This reverts commit 4b46dbc.

Reason: this seems to be breaking load reports in certain cases,
b/276944116

Let's revert so this doesn't accidentally get released.
apolcyn added a commit that referenced this pull request Apr 6, 2023
)

This reverts commit 4b46dbc.

Reason: this seems to be breaking load reports in certain cases,
b/276944116

Let's revert so this doesn't accidentally get released.
apolcyn added a commit to apolcyn/grpc that referenced this pull request Apr 19, 2023
markdroth pushed a commit that referenced this pull request Apr 20, 2023
…#32814) (#32902)

Previous lack-of-load-reporting issue has been fixed (b/276944116)
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
Integration tests have been green so let's enable this (verification of
test results in https://b.corp.google.com/issues/262593165#comment30).
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
This reverts commit 4b46dbc.

Reason: this seems to be breaking load reports in certain cases,
b/276944116

Let's revert so this doesn't accidentally get released.
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
…)" (grpc#32814) (grpc#32902)

Previous lack-of-load-reporting issue has been fixed (b/276944116)
wanlin31 pushed a commit that referenced this pull request May 18, 2023
Integration tests have been green so let's enable this (verification of
test results in https://b.corp.google.com/issues/262593165#comment30).
wanlin31 pushed a commit that referenced this pull request May 18, 2023
This reverts commit 4b46dbc.

Reason: this seems to be breaking load reports in certain cases,
b/276944116

Let's revert so this doesn't accidentally get released.
wanlin31 pushed a commit that referenced this pull request May 18, 2023
…#32814) (#32902)

Previous lack-of-load-reporting issue has been fixed (b/276944116)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bloat/none imported Specifies if the PR has been imported to the internal repository lang/core per-call-memory/neutral per-channel-memory/neutral release notes: yes Indicates if PR needs to be in release notes title needs formatting
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants