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.

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

Ringbuf read on timeout #1111

Merged
merged 3 commits into from
Aug 14, 2023
Merged

Ringbuf read on timeout #1111

merged 3 commits into from
Aug 14, 2023

Conversation

RonFed
Copy link
Contributor

@RonFed RonFed commented Aug 9, 2023

The goal for this PR is describe in #1108

@RonFed RonFed force-pushed the ringbuf-read-on-timeout branch 4 times, most recently from 770b493 to 455f1cb Compare August 9, 2023 20:00
@RonFed RonFed marked this pull request as ready for review August 9, 2023 20:14
mythi
mythi reviewed Aug 10, 2023
View reviewed changes
ringbuf/reader.go Outdated Show resolved Hide resolved
@RonFed RonFed force-pushed the ringbuf-read-on-timeout branch from 455f1cb to 0bc0582 Compare August 10, 2023 14:41
@RonFed
Read available data in ringbuf timeout
1e07890 
Signed-off-by: Ron Federman <ronfederman@mail.tau.ac.il>
@RonFed RonFed force-pushed the ringbuf-read-on-timeout branch from 0bc0582 to 1e07890 Compare August 11, 2023 08:19
lmb
lmb requested changes Aug 11, 2023
View reviewed changes
Copy link
Collaborator

@lmb lmb left a comment

Choose a reason for hiding this comment

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

This looks really nice, thanks! sampleMessage is a good cleanup, we can use it to make discard behaviour more explicit. Left some comments around error handling and testing strategy.

Does it make sense to update Read to mention this behaviour? Or maybe this is better documented on SetDeadline?

ringbuf/reader.go Outdated Show resolved Hide resolved
ringbuf/reader.go Outdated Show resolved Hide resolved
ringbuf/reader_test.go Outdated Show resolved Hide resolved
ringbuf/reader_test.go Show resolved Hide resolved
ringbuf/reader_test.go Outdated Show resolved Hide resolved
@RonFed @lmb
Apply suggestions from code review
d468495 
Co-authored-by: Lorenz Bauer <lmb@users.noreply.github.com>
Signed-off-by: Ron Federman <73110295+RonFed@users.noreply.github.com>
@RonFed
Copy link
Contributor Author

RonFed commented Aug 11, 2023

This looks really nice, thanks! sampleMessage is a good cleanup, we can use it to make discard behaviour more explicit. Left some comments around error handling and testing strategy.

Does it make sense to update Read to mention this behaviour? Or maybe this is better documented on SetDeadline?

Thanks for you comments,
I added a mention for this behaviour in Read, and also updated the test to remove the timing checks

@RonFed
Code reivew changes
d0bc6e1 
Signed-off-by: Ron Federman <ronfederman@mail.tau.ac.il>
@RonFed RonFed force-pushed the ringbuf-read-on-timeout branch from 191bc74 to d0bc6e1 Compare August 11, 2023 11:32
lmb
lmb approved these changes Aug 14, 2023
View reviewed changes
Copy link
Collaborator

@lmb lmb left a comment

Choose a reason for hiding this comment

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

LGTM! I'll squash your changes and merge once CI has passed.

@lmb lmb merged commit 01ebd4c into cilium:main Aug 14, 2023
@RonFed RonFed mentioned this pull request Sep 20, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mythi mythi mythi left review comments

@lmb lmb lmb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RonFed @lmb @mythi