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

channelz: add LocalAddr to listen sockets and test #7062

Merged
merged 3 commits into from Mar 22, 2024
Merged

Conversation

dfawley
Copy link
Member

@dfawley dfawley commented Mar 21, 2024

RELEASE NOTES: none

@dfawley dfawley added this to the 1.63 Release milestone Mar 21, 2024
@dfawley dfawley requested a review from zasweq March 21, 2024 22:44
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

Merging #7062 (d827cbe) into master (eb5828b) will increase coverage by 0.08%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7062      +/-   ##
==========================================
+ Coverage   82.49%   82.58%   +0.08%     
==========================================
  Files         300      300              
  Lines       31351    31357       +6     
==========================================
+ Hits        25864    25896      +32     
+ Misses       4434     4409      -25     
+ Partials     1053     1052       -1     
Files Coverage Δ
server.go 82.23% <100.00%> (+0.64%) ⬆️

... and 17 files with indirect coverage changes

@sergiitk
Copy link
Member

For posterity: the regression introduced in #6969, internal ref b/330220025.

Copy link
Contributor

@zasweq zasweq left a comment

Choose a reason for hiding this comment

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

LGTM outside minor nit. We should trigger an adhoc interop run to see if this fixes.

Comment on lines 223 to 228
return false, fmt.Errorf("server want id %d, but got %d", serverID, srv.ID)
}

skts := srv.ListenSockets()
if got, want := len(skts), 1; got != want {
return false, fmt.Errorf("server has %v sockets; want %v", got, want)
Copy link
Contributor

Choose a reason for hiding this comment

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

Optional nit: keep consistent with go style guide and also I prefer consistent format across errors (and our codebase): https://g3doc.corp.google.com/go/g3doc/style/decisions.md?cl=head#got-before-want

@zasweq zasweq assigned dfawley and unassigned zasweq Mar 21, 2024
@zasweq zasweq merged commit c003fdf into grpc:master Mar 22, 2024
14 checks passed
@zasweq
Copy link
Contributor

zasweq commented Mar 22, 2024

Merged; hopefully tests pass now :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants