Skip to content

xds: Use XdsDependencyManager for XdsNameResolver#11957

Merged
ejona86 merged 5 commits intogrpc:masterfrom
ejona86:a74-phase2
Mar 18, 2025
Merged

xds: Use XdsDependencyManager for XdsNameResolver#11957
ejona86 merged 5 commits intogrpc:masterfrom
ejona86:a74-phase2

Conversation

@ejona86
Copy link
Copy Markdown
Member

@ejona86 ejona86 commented Mar 11, 2025

I'm going to leave this in draft form until after I squash and rebase on master (once the review has gotten to that point).

"Gracefully handle tcp listeners. Fix error processing in XdsNR" is partly speculative right now, as we have a discussion of how error handling should be done. The tcp listeners is needed, but it got mixed together with onError() behavior. I can split it up needed. The gRFC changed to match the behavior here. grpc/proposal@fea3788

@ejona86 ejona86 requested a review from larry-safran March 11, 2025 22:06
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsNameResolver.java Outdated
Copy link
Copy Markdown
Member Author

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

These replies are just for posterity. We discussed in-person.

Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
Comment thread xds/src/main/java/io/grpc/xds/XdsNameResolver.java Outdated
Contributes to the gRFC A74 effort.
https://github.com/grpc/proposal/blob/master/A74-xds-config-tears.md

Co-authored-by: Eric Anderson <ejona@google.com>
ejona86 added 3 commits March 16, 2025 20:08
The alternative to using Mockito's ArgumentMatcher is to use Hamcrest.
However, Hamcrest did not impress me. ArgumentMatcher is trivial if you
don't care about the error message.
This fixes a pre-existing issue where ConfigSelector.releaseCluster
could revert the LB config back to using cluster manager after releasing
all RPCs using a cluster have committed.
Unused since the context string was included directly into Data's
StatusOr
@ejona86 ejona86 marked this pull request as ready for review March 17, 2025 23:05
@ejona86
Copy link
Copy Markdown
Member Author

ejona86 commented Mar 17, 2025

I saw there's still a new TODO for a test, but I'll look at that later.

@ejona86 ejona86 requested a review from larry-safran March 17, 2025 23:06
}

static final class StringContainsMatcher implements ArgumentMatcher<String> {
private final String needle;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I like the variable names :)

@ejona86 ejona86 merged commit e80c197 into grpc:master Mar 18, 2025
16 checks passed
@ejona86 ejona86 deleted the a74-phase2 branch March 18, 2025 21:06
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants