fix: use a lock to ensure only need to run tunnel just in case multiple go… #5885
+92
−8
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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements file-based locking to ensure only one tunnel instance runs across multiple goose-server processes. The fix uses the fs2 crate for cross-process exclusive file locks, preventing duplicate tunnel instances from starting simultaneously.
Key changes:
- Added
fs2dependency for cross-process file locking - Implemented lock acquisition/release functions with PID tracking
- Integrated lock into
TunnelManagerlifecycle (acquire on start, release on stop/error) - Updated status reporting to detect tunnels running in other instances
- Changed auto-start error logging from
errortoinfolevel when lock is already held
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
crates/goose-server/src/tunnel/mod.rs |
Core implementation: adds lock acquisition/checking functions, integrates file lock into TunnelManager struct, updates start/stop to acquire/release lock, modifies status reporting to detect tunnels in other instances |
crates/goose-server/Cargo.toml |
Adds fs2 0.4.3 dependency for file locking |
Cargo.lock |
Updates lock file with fs2 dependency |
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.
there can be multiple goosed but should only be one tunnel running.
small one - would rather not need to do this, but as things are now, we let many goosed fly (pun intended) so as this is in process, don't really want to double up (not sure what would happen - probably nothing functionally good!)