Skip to content

xds: Revert workaround to get SubConn locality#8802

Merged
arjan-bal merged 1 commit into
grpc:masterfrom
arjan-bal:dualstack-cleanup-locality-id
Jan 7, 2026
Merged

xds: Revert workaround to get SubConn locality#8802
arjan-bal merged 1 commit into
grpc:masterfrom
arjan-bal:dualstack-cleanup-locality-id

Conversation

@arjan-bal

@arjan-bal arjan-bal commented Jan 6, 2026

Copy link
Copy Markdown
Contributor

#7378 added an internal API to propagate the locality ID of each address used by a subchannel. This was required because the legacy pick_first implementation created subchannels with multiple addresses, each with a potentially different locality. Since the legacy implementation has been removed, and the new pick_first creates subchannels with only a single address, this workaround is now redundant. This PR also make the UpdateAddresses method of clusterImpl balancer a no-op since none of the leaf policies use it anymore.

RELEASE NOTES: N/A

@arjan-bal arjan-bal added Type: Internal Cleanup Refactors, etc Area: xDS Includes everything xDS related, including LB policies used with xDS. labels Jan 6, 2026
@arjan-bal arjan-bal added this to the 1.79 Release milestone Jan 6, 2026
@arjan-bal arjan-bal changed the title xds: Undo workaround for #7339 xds: Undo workaround to get SubConn locality Jan 6, 2026
@arjan-bal arjan-bal requested a review from easwars January 6, 2026 10:27
@arjan-bal arjan-bal changed the title xds: Undo workaround to get SubConn locality xds: Revert workaround to get SubConn locality Jan 6, 2026
@arjan-bal arjan-bal force-pushed the dualstack-cleanup-locality-id branch from 923674b to 6d59e36 Compare January 6, 2026 16:55
@codecov

codecov Bot commented Jan 6, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 66.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.31%. Comparing base (c6d5e5e) to head (6d59e36).
⚠️ Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
internal/xds/balancer/clusterimpl/clusterimpl.go 33.33% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8802      +/-   ##
==========================================
+ Coverage   83.26%   83.31%   +0.04%     
==========================================
  Files         418      417       -1     
  Lines       33004    32972      -32     
==========================================
- Hits        27480    27469      -11     
+ Misses       4109     4095      -14     
+ Partials     1415     1408       -7     
Files with missing lines Coverage Δ
balancer/balancer.go 93.75% <ø> (-0.70%) ⬇️
balancer_wrapper.go 85.30% <100.00%> (+1.27%) ⬆️
clientconn.go 90.68% <100.00%> (+0.23%) ⬆️
internal/internal.go 60.00% <ø> (ø)
internal/xds/balancer/clusterimpl/picker.go 95.12% <100.00%> (ø)
internal/xds/balancer/clusterimpl/clusterimpl.go 87.56% <33.33%> (+3.69%) ⬆️

... and 22 files with indirect coverage changes

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

@easwars easwars assigned arjan-bal and unassigned easwars Jan 7, 2026
@arjan-bal arjan-bal merged commit e7a6fed into grpc:master Jan 7, 2026
14 checks passed
@arjan-bal arjan-bal deleted the dualstack-cleanup-locality-id branch January 7, 2026 06:24
mbissa pushed a commit to mbissa/grpc-go that referenced this pull request Feb 16, 2026
grpc#7378 added an internal API to propagate the locality ID of each address
used by a subchannel. This was required because the legacy pick_first
implementation created subchannels with multiple addresses, each with a
potentially different locality. Since the legacy implementation has been
removed, and the new pick_first creates subchannels with only a single
address, this workaround is now redundant. This PR also make the
`UpdateAddresses` method of `clusterImpl` balancer a no-op since none of
the leaf policies use it anymore.

RELEASE NOTES: N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants