[client] Fix shutdown blocking on stuck ICE agent close#4780
Merged
Conversation
Contributor
WalkthroughThe change introduces a timeout mechanism to the ThreadSafeAgent.Close() method in the ICE agent module. A new constant defines the maximum wait duration for Close operations. The Close method now executes the underlying agent's Close concurrently with timeout protection, logging a warning if the timeout elapses before completion. Changes
Sequence DiagramsequenceDiagram
actor Caller
participant TSA as ThreadSafeAgent
participant Agent as ICE Agent
participant Timer
Caller->>TSA: Close()
TSA->>Agent: Start Close() (async)
TSA->>Timer: Start timeout
par
Agent-->>TSA: Close() result (or hangs)
and
Timer-->>TSA: Timeout elapsed
end
alt Close completes first
TSA-->>Caller: Return Close() error
else Timeout occurs first
rect rgba(255, 193, 7, 0.2)
TSA->>TSA: Log warning
end
TSA-->>Caller: Return nil (proceed with cleanup)
end
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes
Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
Comment |
|
pappz
approved these changes
Nov 13, 2025
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
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.



Describe your changes
In some cases, the ICE agent will block on Close() indefinitely, blocking the shutdown or restart process.
To avoid that, we add a 3-second timeout after which we abandon waiting for the close operation and proceed with shutdown.
Issue ticket number and link
Stack
Checklist
Documentation
Select exactly one:
Docs PR URL (required if "docs added" is checked)
Paste the PR link from https://github.com/netbirdio/docs here:
https://github.com/netbirdio/docs/pull/__
Summary by CodeRabbit