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

[Jaeger-Agent] Use RawConn.Control to get fd instead of Fd() #4449

Merged
merged 1 commit into from
May 11, 2023

Conversation

ChenX1993
Copy link
Contributor

@ChenX1993 ChenX1993 commented May 9, 2023

Which problem is this PR solving?

Resolves #4448

Short description of the changes

Jaeger agent gets stuck when closing with SocketBufferSize set. This is because Close() of net.UDPConn will be blocked if Fd() is used to get the file descriptor.
Use RawConn.Control instead to get fd to set the socket buffer.

Same issue was discussed here: golang/go#29277
The fix refers to here: brucespang/go-tcpinfo#3

@ChenX1993 ChenX1993 requested a review from a team as a code owner May 9, 2023 05:09
@ChenX1993 ChenX1993 requested a review from pavolloffay May 9, 2023 05:09
@codecov
Copy link

codecov bot commented May 9, 2023

Codecov Report

Patch coverage: 46.15% and project coverage change: -0.03 ⚠️

Comparison is base (5c3c20d) 97.07% compared to head (1e3ab01) 97.05%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4449      +/-   ##
==========================================
- Coverage   97.07%   97.05%   -0.03%     
==========================================
  Files         300      300              
  Lines       17728    17738      +10     
==========================================
+ Hits        17210    17215       +5     
- Misses        416      419       +3     
- Partials      102      104       +2     
Flag Coverage Δ
unittests 97.05% <46.15%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cmd/agent/app/servers/thriftudp/socket_buffer.go 43.75% <46.15%> (-6.25%) ⬇️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

please make sure commits are signed

@ChenX1993
Copy link
Contributor Author

please make sure commits are signed

Signed

@yurishkuro yurishkuro merged commit d6b4482 into jaegertracing:main May 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Jaeger agent gets stuck when closing with SocketBufferSize set
2 participants