relay: make only 1 reservation per peer #2974
Open
+84
−72
Conversation
This file contains 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
We only need 1 reservation per peer. This PR also proactively removes relay reservations on disconnecting from the peer. This helps when the relay client is restarting frequently.
MarcoPolo
approved these changes
Oct 2, 2024
| } | ||
| if err := c.AddReservation(p, randomIPv4Addr(t)); err != errTooManyReservationsForPeer { | ||
| if err := c.Reserve(p2, ipAddr, expiry); err != errTooManyReservationsForIP { | ||
| t.Fatalf("expected to run into total reservation limit, got %v", err) |
There was a problem hiding this comment.
The text here needs to be updated. Maybe:
"Expected to error since this ip has already been reserved by a different peer"
| if err := c.Reserve(p, randomIPv4Addr(t), expiry); err != nil { | ||
| t.Fatalf("expected to update reservation for peer, got %v", err) | ||
| } | ||
| if err := c.Reserve(p2, ipAddr, expiry); err != nil { | ||
| t.Fatalf("expected reservation for different peer to be possible, got %v", err) |
There was a problem hiding this comment.
Same comment here. The text probably should change.
| asns: make(map[uint32][]time.Time), | ||
| rc: rc, | ||
| ips: make(map[string][]peerWithExpiry), | ||
| asns: make(map[uint32][]peerWithExpiry), | ||
| } | ||
| } | ||
|
|
||
| // AddReservation adds a reservation for a given peer with a given multiaddr. |
| @@ -22,6 +22,8 @@ type Resources struct { | |||
|
|
|||
| // MaxReservationsPerPeer is the maximum number of reservations originating from the same | |||
| // peer; default is 4. | |||
| // | |||
| // Deprecated: We only need 1 reservation per peer. | |||
There was a problem hiding this comment.
Let's change the default below as well
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.
We only need 1 reservation per peer.
This PR also proactively removes relay reservations on disconnecting from the peer. This helps when the relay client is restarting frequently.
Fixes: #2963