Skip to content

internal/xds: change xds_resolver to use dependency manager #8711

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
Merged
merged 14 commits into from
Dec 3, 2025
Merged

internal/xds: change xds_resolver to use dependency manager #8711

merged 14 commits into from
Dec 3, 2025
+241 −386

Conversation

@eshitachandwani
Copy link
Member

@eshitachandwani eshitachandwani commented Nov 17, 2025 •
edited
Loading

This change is part of A74 implementation.

This PR removes the listener and route watchers from resolver and changes it so that we get the resources from xds dependency manager.

RELEASE NOTES:

  • xds/resolver:
    • Changes the behavior such that getting no matching virtual host in a route resource will now drop any previous resource and report the error.
    • Changes the behavior so that receiving a configuration error (LDS/RDS ambient error) after a successful update will now only be logged, and the system will continue using the previous resource to avoid transient channel failures

@eshitachandwani eshitachandwani added Type: Internal Cleanup Refactors, etc Area: xDS Includes everything xDS related, including LB policies used with xDS. labels Nov 17, 2025
@codecov
Copy link

codecov bot commented Nov 17, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 81.39535% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.20%. Comparing base (08d0792) to head (70b91fa).
⚠️ Report is 7 commits behind head on master.

Files with missing lines Patch % Lines
internal/xds/resolver/xds_resolver.go 81.39% 5 Missing and 3 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8711      +/-   ##
==========================================
- Coverage   83.31%   83.20%   -0.11%     
==========================================
  Files         419      418       -1     
  Lines       32429    32356      -73     
==========================================
- Hits        27017    26922      -95     
- Misses       4038     4049      +11     
- Partials     1374     1385      +11
Files with missing lines Coverage Δ
internal/xds/resolver/xds_resolver.go 88.57% <81.39%> (+6.14%) ⬆️

... and 35 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@eshitachandwani eshitachandwani added this to the 1.78 Release milestone Nov 17, 2025
@eshitachandwani eshitachandwani requested review from arjan-bal and easwars and removed request for easwars November 17, 2025 03:27
arjan-bal
arjan-bal reviewed Nov 17, 2025
View reviewed changes
@eshitachandwani eshitachandwani changed the title internal:xds change xds_resolver to use dependency manager internal/xds: change xds_resolver to use dependency manager Nov 17, 2025
@easwars
Copy link
Contributor

easwars commented Nov 17, 2025

Is the PR description out of date? I don't see any changes about switching the dependency manager to use the serializer again.

easwars
easwars reviewed Nov 17, 2025
View reviewed changes
@easwars easwars assigned eshitachandwani and unassigned easwars and arjan-bal Nov 17, 2025
@eshitachandwani
Copy link
Member Author

eshitachandwani commented Nov 18, 2025

Is the PR description out of date? I don't see any changes about switching the dependency manager to use the serializer again.

Yeah sorry , I was making that change earlier but Arjan suggested a different way, so that got changed.

easwars
easwars approved these changes Nov 25, 2025
View reviewed changes
Copy link
Contributor

@easwars easwars left a comment

Choose a reason for hiding this comment

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

LGTM, modulo minor nits

internal/xds/resolver/xds_resolver.go Outdated
logger *grpclog.PrefixLogger
ldsResourceName string
dm *xdsdepmgr.DependencyManager
// The underlying xdsClient which performs all xDS requests and responses.
Copy link
Contributor

@easwars easwars Nov 25, 2025

Choose a reason for hiding this comment

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

This comment was probably added way back when we were still getting used to what the xDS client was. I think we can remove it now. Doesn't add much value.

Copy link
Member Author

@eshitachandwani eshitachandwani Nov 27, 2025

Choose a reason for hiding this comment

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

Done.

@easwars easwars assigned eshitachandwani and unassigned easwars Nov 25, 2025
@eshitachandwani eshitachandwani removed their assignment Nov 27, 2025
arjan-bal
arjan-bal reviewed Nov 27, 2025
View reviewed changes
internal/xds/resolver/xds_resolver_test.go Outdated
}},
}

// Expect an error update from the resolver. Since the resource is cached,
Copy link
Contributor

@arjan-bal arjan-bal Nov 27, 2025

Choose a reason for hiding this comment

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

This comment probably needs to be updated since the resolver doesn't report an error for ambient listener and route errors anymore.

Copy link
Member Author

@eshitachandwani eshitachandwani Nov 27, 2025

Choose a reason for hiding this comment

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

Done.

arjan-bal
arjan-bal reviewed Dec 1, 2025
View reviewed changes
@arjan-bal arjan-bal assigned easwars and eshitachandwani and unassigned arjan-bal Dec 1, 2025
arjan-bal
arjan-bal approved these changes Dec 2, 2025
View reviewed changes
Copy link
Contributor

@arjan-bal arjan-bal left a comment

Choose a reason for hiding this comment

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

LGTM

@eshitachandwani eshitachandwani merged commit 4c27cc8 into grpc:master Dec 3, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@easwars easwars easwars approved these changes

@arjan-bal arjan-bal arjan-bal approved these changes

Assignees

@eshitachandwani eshitachandwani

Labels

Area: xDS Includes everything xDS related, including LB policies used with xDS. Type: Internal Cleanup Refactors, etc

Projects

None yet

Milestone

1.78 Release

Development

Successfully merging this pull request may close these issues.

3 participants

@eshitachandwani @easwars @arjan-bal