dhcp_proxy: set timeout_sender only if required
#1263
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewer's GuideThis PR introduces an inactivity_timeout in NetavarkProxyService and wraps the reset_inactivity_timeout call in a zero-check to prevent queuing timer resets when the timeout is disabled. Sequence diagram for conditional timer reset in get_leasesequenceDiagram
participant Client
participant NPS as NetavarkProxyService
participant TC as TimerChannel (activity_timeout_tx)
Client->>+NPS: get_lease(request)
NPS->>NPS: Read self.inactivity_timeout
alt inactivity_timeout is not zero
NPS->>NPS: self.reset_inactivity_timeout()
NPS->>TC: Send reset signal
end
NPS-->>-Client: NetavarkLease / Status
File-Level Changes
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey @flouthoc - I've reviewed your changes and they look great!
Here's what I looked at during the review
- 🟢 General issues: all looks good
- 🟢 Security: all looks good
- 🟢 Testing: all looks good
- 🟢 Complexity: all looks good
- 🟢 Documentation: all looks good
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Luap99
reviewed
May 28, 2025
src/commands/dhcp_proxy.rs
Outdated
| @@ -55,6 +55,8 @@ struct NetavarkProxyService<W: Write + Clear> { | |||
| cache: Arc<Mutex<LeaseCache<W>>>, | |||
| // the timeout for the dora operation | |||
| dora_timeout: u32, | |||
| // inactivity_timeout duration in seconds | |||
| inactivity_timeout: Duration, | |||
There was a problem hiding this comment.
Would it be cleaner to wrap timeout_sender in an Option<> and then the option is set to None when the timeout is zero?
Looking at the code there should not be a reason to create the channel at all when the timeout is zero I think.
There was a problem hiding this comment.
Would it be cleaner to wrap timeout_sender in an Option<> and then the option is set to None when the timeout is zero?
Yes we can do this.
Looking at the code there should not be a reason to create the channel at all when the timeout is zero I think.
Sounds like a good idea, let me see if we can do this.
flouthoc
changed the title
timeout_sender only if required
|
@Luap99 WDYT about this patch, could you give it a quick try. |
When `--activity-timeout 0` there should be no reason to push messages on `activity_timeout_tx` as `activity_timeout_rx` is not receving any messages as a result all the messages pushed are just stuck in queue, resulting in `no available capacity` when queue becomes full. Closes: containers#1262 Signed-off-by: flouthoc <[email protected]>
|
LGTM |
|
This should also close #1024 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: flouthoc, Luap99, sourcery-ai[bot] The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When
--activity-timeout 0there should be no reason to push messages onactivity_timeout_txasactivity_timeout_rxis not receving any messages as a result all the messages pushed are just stuck in queue, resulting inno available capacitywhen queue becomes full.Closes: #1262
Summary by Sourcery
Disable resetting the inactivity timer when it’s configured as zero to avoid filling the activity timeout channel and causing queue overflows.
Bug Fixes:
Enhancements: